Being more flexible in when not to explicitly set the sysroot when compiling for WASI (GH-142242)

brettcannon · web-flow · commit c5252045d3a7 · 2025-12-03T15:42:10.000-08:00
diff --git a/Tools/wasm/wasi/__main__.py b/Tools/wasm/wasi/__main__.py
@@ -271,7 +271,7 @@ def wasi_sdk_env(context):
     for env_var, binary_name in list(env.items()):
         env[env_var] = os.fsdecode(wasi_sdk_path / "bin" / binary_name)
 
-    if wasi_sdk_path != pathlib.Path("/opt/wasi-sdk"):
+    if not wasi_sdk_path.name.startswith("wasi-sdk"):
         for compiler in ["CC", "CPP", "CXX"]:
             env[compiler] += f" --sysroot={sysroot}"
 
