admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bazel] Set CLOSURE_COMPILER to workaround RBE+symlinks issue (#1037)

Browse Source 
* [bazel] Set CLOSURE_COMPILER to workaround RBE+symlinks issue

* space

* specify node_js
This commit is contained in:
Kevin Lubick
2022-04-27 13:13:53 -04:00
committed by GitHub
parent e34773a0d1
commit d8a1f6c637
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bazel/emscripten_toolchain/emscripten_config
View File

@@ -3,8 +3,8 @@ import platform
ROOT_DIR = os.environ["ROOT_DIR"] ROOT_DIR = os.environ["ROOT_DIR"]
EMSCRIPTEN_ROOT = os.environ["EMSCRIPTEN"] EMSCRIPTEN_ROOT = os.environ["EMSCRIPTEN"]
BINARYEN_ROOT = ROOT_DIR + "/" + os.environ["EM_BIN_PATH"] BINARYEN_ROOT = os.path.join(ROOT_DIR, os.environ["EM_BIN_PATH"])
LLVM_ROOT = BINARYEN_ROOT + "/bin" LLVM_ROOT = os.path.join(BINARYEN_ROOT, "bin")
FROZEN_CACHE = True FROZEN_CACHE = True
system = platform.system() system = platform.system()
@@ -12,3 +12,12 @@ system = platform.system()
machine = "arm64" if platform.machine() == "arm64" else "amd64" machine = "arm64" if platform.machine() == "arm64" else "amd64"
nodejs_binary = "bin/nodejs/node.exe" if(system =="Windows") else "bin/node" nodejs_binary = "bin/nodejs/node.exe" if(system =="Windows") else "bin/node"
NODE_JS = ROOT_DIR + "/external/nodejs_{}_{}/{}".format(system.lower(), machine, nodejs_binary) NODE_JS = ROOT_DIR + "/external/nodejs_{}_{}/{}".format(system.lower(), machine, nodejs_binary)
# This works around an issue with Bazel RBE where the symlinks in node_modules/.bin
# are uploaded as the linked files, which means the cli.js cannot load its
# dependencies from the expected locations.
# See https://github.com/emscripten-core/emscripten/pull/16640 for more
if system != "Windows":
CLOSURE_COMPILER = [NODE_JS, os.path.join(EMSCRIPTEN_ROOT, "node_modules",
"google-closure-compiler", "cli.js")]