https://github.com/python/cpython/commit/18343c09856fcac11f813a5a59ffe3a35928c0cc
commit: 18343c09856fcac11f813a5a59ffe3a35928c0cc
branch: main
author: Brett Cannon <[email protected]>
committer: brettcannon <[email protected]>
date: 2024-02-15T00:51:23Z
summary:
GH-113516: don't set `LDSHARED` when building for WASI (GH-115495)
files:
A Misc/NEWS.d/next/Tools-Demos/2024-02-14-15-58-13.gh-issue-113516.TyIHWx.rst
M Tools/wasm/wasi-env
M 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
index 00000000000000..0dd1128e02de81
--- /dev/null
+++
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
index 48908b02e60b96..e6c6fb2d8e47e7 100755
--- 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
index 46ecae74a9ecea..1e75db5c7b8329 100644
--- 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)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
