From b2e8e924f8dd5339a09092d1c6139ab24dc0945c Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Thu, 30 Apr 2020 22:44:23 +0000 Subject: [PATCH] toolchain: make emscripten toolchain work with rules_foreign_cc Signed-off-by: Lizan Zhou --- toolchain/common.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/toolchain/common.sh b/toolchain/common.sh index c5fc039..9f7863b 100755 --- a/toolchain/common.sh +++ b/toolchain/common.sh @@ -20,16 +20,20 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then cd -P /proc/self/cwd fi +TOOLCHAIN_ROOT=${EXT_BUILD_ROOT:-$PWD} + export NODE_JS='' -export EMSCRIPTEN_ROOT='external/emscripten_toolchain' +export EMSCRIPTEN_ROOT="${TOOLCHAIN_ROOT}/external/emscripten_toolchain" export SPIDERMONKEY_ENGINE='' export EM_EXCLUSIVE_CACHE_ACCESS=1 export EMCC_SKIP_SANITY_CHECK=1 export EMCC_WASM_BACKEND=1 -source external/emscripten_toolchain/emsdk_env.sh +#echo "$(pwd)/external/emscripten_toolchain/emsdk_env.sh" +#realpath "external/emscripten_toolchain/emsdk_env.sh" +source "${EMSCRIPTEN_ROOT}/emsdk_env.sh" # the emscripten sdk does some path comparison, so make EM_CACHE an absolute path to make it work. -mkdir -p "tmp/emscripten_cache" -export EM_CACHE=${PWD}"/tmp/emscripten_cache" -export TEMP_DIR="tmp" +mkdir -p "${TOOLCHAIN_ROOT}/tmp/emscripten_cache" +export EM_CACHE="${TOOLCHAIN_ROOT}/tmp/emscripten_cache" +export TEMP_DIR="${TOOLCHAIN_ROOT}/tmp"