]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
GH-113516: don't set `LDSHARED` when building for WASI (GH-115495)
authorBrett Cannon <brett@python.org>
Thu, 15 Feb 2024 00:51:23 +0000 (16:51 -0800)
committerGitHub <noreply@github.com>
Thu, 15 Feb 2024 00:51:23 +0000 (00:51 +0000)
Misc/NEWS.d/next/Tools-Demos/2024-02-14-15-58-13.gh-issue-113516.TyIHWx.rst [new file with mode: 0644]
Tools/wasm/wasi-env
Tools/wasm/wasi.py

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
new file mode 100644 (file)
index 0000000..0dd1128
--- /dev/null
@@ -0,0 +1 @@
+Don't set ``LDSHARED`` when building for WASI.
index 48908b02e60b960aed514d69ce87f5f835e3ccd7..e6c6fb2d8e47e75e188fee4cffc811beb618fe1c 100755 (executable)
@@ -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"
 
index 46ecae74a9ecea70ad6239378c4726d0475c4e42..1e75db5c7b83299d190a577463a577ec85f32ae4 100644 (file)
@@ -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)