From 7179fac39beb7ee33a7818eee69f74ec03ec47bf Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Wed, 28 Aug 2019 11:20:14 -0700 Subject: [PATCH] Set EMSCRIPTEN_ROOT in releases builds (#333) Without setting this, if a non-releases build was previously activated, it will keep affecting EMSCRIPTEN_ROOT in the emitted config file. Helps with #326 --- emsdk_manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emsdk_manifest.json b/emsdk_manifest.json index 8bf33d0..1250f44 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -177,7 +177,7 @@ "zipfile_prefix": "%releases-tag%-", "install_path": "upstream", "activated_path": "%installation_dir%/emscripten", - "activated_cfg": "LLVM_ROOT='%installation_dir%/bin';BINARYEN_ROOT='%installation_dir%'", + "activated_cfg": "LLVM_ROOT='%installation_dir%/bin';BINARYEN_ROOT='%installation_dir%';EMSCRIPTEN_ROOT='%installation_dir%/emscripten'", "emscripten_releases_hash": "%releases-tag%", "pregenerated_cache": "wasm-obj" }, @@ -192,7 +192,7 @@ "zipfile_prefix": "%releases-tag%-", "install_path": "fastcomp", "activated_path": "%installation_dir%/emscripten", - "activated_cfg": "LLVM_ROOT='%installation_dir%/fastcomp/bin';BINARYEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/bin/optimizer%.exe%'", + "activated_cfg": "LLVM_ROOT='%installation_dir%/fastcomp/bin';BINARYEN_ROOT='%installation_dir%';EMSCRIPTEN_ROOT='%installation_dir%/emscripten';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/bin/optimizer%.exe%'", "emscripten_releases_hash": "%releases-tag%", "pregenerated_cache": "asmjs" },