pythonGH-113516: don't set LDSHARED when building for WASI

brettcannon · Feb 14, 2024 · 98ad9c1 · 98ad9c1
1 parent 4684301
commit 98ad9c1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Misc/NEWS.d/next/Tools-Demos/2024-02-14-15-58-13.gh-issue-113516.TyIHWx.rst b/Misc/NEWS.d/next/Tools-Demos/2024-02-14-15-58-13.gh-issue-113516.TyIHWx.rst
@@ -0,0 +1 @@
+Don't set `LDSHARED` when building for WASI.
diff --git a/Tools/wasm/wasi-env b/Tools/wasm/wasi-env
@@ -55,7 +55,6 @@ if command -v ccache >/dev/null 2>&1; then
     CXX="ccache ${CXX}"
 fi
 
-LDSHARED="${WASI_SDK_PATH}/bin/wasm-ld"
 AR="${WASI_SDK_PATH}/bin/llvm-ar"
 RANLIB="${WASI_SDK_PATH}/bin/ranlib"
 

diff --git a/Tools/wasm/wasi.py b/Tools/wasm/wasi.py
@@ -165,7 +165,7 @@ def wasi_sdk_env(context):
     wasi_sdk_path = context.wasi_sdk_path
     sysroot = wasi_sdk_path / "share" / "wasi-sysroot"
     env = {"CC": "clang", "CPP": "clang-cpp", "CXX": "clang++",
-           "LDSHARED": "wasm-ld", "AR": "llvm-ar", "RANLIB": "ranlib"}
+           "AR": "llvm-ar", "RANLIB": "ranlib"}
 
     for env_var, binary_name in list(env.items()):
         env[env_var] = os.fsdecode(wasi_sdk_path / "bin" / binary_name)