Skip to content

Commit 247e10e

Browse files
authored
scripts: remove env initialization from setup_toolchain (#228)
1 parent 7dfc688 commit 247e10e

1 file changed

Lines changed: 4 additions & 14 deletions

File tree

scripts/shared.sh

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,24 +197,14 @@ setup_toolchain() {
197197

198198
mkdir -p "${_src_dir}/third_party/node/linux/node-linux-x64/bin"
199199
ln -sf "$(which node)" "${_src_dir}/third_party/node/linux/node-linux-x64/bin/node"
200-
201-
local clang_bin="${_src_dir}/third_party/llvm-build/Release+Asserts/bin"
202-
export CC="${clang_bin}/clang"
203-
export CXX="${clang_bin}/clang++"
204-
export AR="${clang_bin}/llvm-ar"
205-
export NM="${clang_bin}/llvm-nm"
206-
export LLVM_BIN="${clang_bin}"
207-
208-
local resource_dir
209-
resource_dir="$(${CC%% *} --print-resource-dir)"
210-
export CXXFLAGS+=" -resource-dir=${resource_dir} -B${LLVM_BIN}"
211-
export CPPFLAGS+=" -resource-dir=${resource_dir} -B${LLVM_BIN}"
212-
export CFLAGS+=" -resource-dir=${resource_dir} -B${LLVM_BIN}"
213200
}
214201

215202
gn_gen() {
216203
cd "${_src_dir}"
217-
./tools/gn/bootstrap/bootstrap.py -o out/Default/gn --skip-generate-buildfiles
204+
local clang_bin="${_src_dir}/third_party/llvm-build/Release+Asserts/bin"
205+
CXX="$clang_bin/clang++" ./tools/gn/bootstrap/bootstrap.py \
206+
-o out/Default/gn \
207+
--skip-generate-buildfiles
218208
./out/Default/gn gen out/Default --fail-on-unused-args
219209
}
220210

0 commit comments

Comments
 (0)