From 18343c09856fcac11f813a5a59ffe3a35928c0cc Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Wed, 14 Feb 2024 16:51:23 -0800 Subject: [PATCH] GH-113516: don't set `LDSHARED` when building for WASI (GH-115495) --- .../Tools-Demos/2024-02-14-15-58-13.gh-issue-113516.TyIHWx.rst | 1 + Tools/wasm/wasi-env | 1 - Tools/wasm/wasi.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Tools-Demos/2024-02-14-15-58-13.gh-issue-113516.TyIHWx.rst 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 00000000000..0dd1128e02d --- /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 48908b02e60..e6c6fb2d8e4 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 46ecae74a9e..1e75db5c7b8 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)