skia /
skcms /
4a4ff5bbefdf22f0057eabb79c120a8939439c96 update emscripten/node
Tested with this patch on Mac,
$ cat ~/em_config
LLVM_ROOT = '/Users/mtklein/emsdk/upstream/bin'
BINARYEN_ROOT = '/Users/mtklein/emsdk/upstream'
EMSCRIPTEN_ROOT = '/Users/mtklein/emsdk/upstream/emscripten'
NODE_JS = '/Users/mtklein/emsdk/node/14.15.5_64bit/bin/node'
COMPILER_ENGINE = NODE_JS
JS_ENGINES = [NODE_JS]
$ git diff
diff --git a/ninja/emscripten b/ninja/emscripten
index 6961beb..4e94332 100644
--- a/ninja/emscripten
+++ b/ninja/emscripten
@@ -16,4 +16,8 @@ rule run
include ninja/common
-disabled = (uname | grep -qv Linux)
+disabled = false
+
+cc = env EM_CONFIG=/Users/mtklein/em_config /Users/mtklein/emsdk/upstream/emscripten/emcc
+cxx = env EM_CONFIG=/Users/mtklein/em_config /Users/mtklein/emsdk/upstream/emscripten/em++
+node = /Users/mtklein/emsdk/node/14.15.5_64bit/bin/node
I tested this on Mac, so I might make the Mac bots do this too.
Change-Id: I5a10167d00d0928d7e27516a771159aa2b2d700e
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/374159
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
1 file changed