From 42abe55fd723bb6d493eb68183db747cc4e8cdcf Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Mon, 21 Sep 2020 16:59:19 -0700 Subject: [PATCH] Remove native optimizer build from emscripten master install (#622) This is still used for the legacy emscripten tags installation but the native optimizer no longer exists on master. This fixes `emsdk install emscripten-master-64bit` --- emsdk_manifest.json | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/emsdk_manifest.json b/emsdk_manifest.json index b1e59d2..8b01d57 100644 --- a/emsdk_manifest.json +++ b/emsdk_manifest.json @@ -395,13 +395,11 @@ "append_bitness": false, "url": "https://github.com/emscripten-core/emscripten.git", "git_branch": "master", - "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'", + "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'", "activated_path": "%installation_dir%", - "activated_env": "EMSCRIPTEN=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%", + "activated_env": "EMSCRIPTEN=%installation_dir%", "cmake_build_type": "Release", - "custom_install_script": "emscripten_post_install", - "custom_is_installed_script": "is_optimizer_installed", - "custom_uninstall_script": "uninstall_optimizer" + "custom_install_script": "emscripten_npm_install" }, { "id": "emscripten", @@ -410,13 +408,11 @@ "append_bitness": false, "url": "https://github.com/emscripten-core/emscripten.git", "git_branch": "master", - "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'", + "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'", "activated_path": "%installation_dir%", - "activated_env": "EMSCRIPTEN=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%", + "activated_env": "EMSCRIPTEN=%installation_dir%", "cmake_build_type": "Release", - "custom_install_script": "emscripten_post_install", - "custom_is_installed_script": "is_optimizer_installed", - "custom_uninstall_script": "uninstall_optimizer" + "custom_install_script": "emscripten_npm_install" }, { "id": "binaryen",