Update default paths of EMSDK components

Author: jirkamarsik

wasm/ci/ci_common/common.jsonnet

@@ -117,7 +117,7 @@ local graal_suite_root = root_ci.graal_suite_root;
     setup+: [
       ['set-export', 'ROOT_DIR', ['pwd']],
       ['set-export', 'EM_CONFIG', '$ROOT_DIR/.emscripten-config'],
-      ['mx', 'emscripten-init', '--detect', '$EM_CONFIG', '$EMSDK_DIR']
+      ['mx', 'emscripten-init', '$EM_CONFIG', '$EMSDK_DIR']
     ],
   },
 

wasm/mx.wasm/mx_wasm.py

@@ -665,10 +665,10 @@ def emscripten_init(args):
     config_path = os.path.join(os.getcwd(), args.config_path)
     emsdk_path = args.emsdk_path
 
-    llvm_root = os.path.join(emsdk_path, "llvm", "git", "build_master_64", "bin")
-    binaryen_root = os.path.join(emsdk_path, "binaryen", "master_64bit_binaryen")
-    emscripten_root = os.path.join(emsdk_path, "emscripten", "master")
-    node_js = os.path.join(emsdk_path, "node", "12.9.1_64bit", "bin", "node")
+    llvm_root = os.path.join(emsdk_path, "upstream", "bin")
+    binaryen_root = os.path.join(emsdk_path, "binaryen", "main_64bit_binaryen")
+    emscripten_root = os.path.join(emsdk_path, "upstream", "emscripten")
+    node_js = os.path.join(emsdk_path, "node", "22.16.0_64bit", "bin", "node")
 
     def find_executable(exe_name):
         for root, _, files in os.walk(args.emsdk_path):