From 9bb3f565922ecee976d78acaf0eec5250028275e Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 15 Feb 2024 02:34:45 +0100 Subject: [PATCH] [3.11] [3.12] GH-113516: don't set `LDSHARED` when building for WASI (GH-115495) (GH-115496) (GH-115497) [3.12] GH-113516: don't set `LDSHARED` when building for WASI (GH-115495) (GH-115496) (cherry picked from commit 0e4f73b8e457b1efa57b735205e8e85a3d11d9f2) Co-authored-by: Brett Cannon --- .../Tools-Demos/2024-02-14-15-58-13.gh-issue-113516.TyIHWx.rst | 1 + Tools/wasm/wasi-env | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) 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 000000000000..0dd1128e02de --- /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 48908b02e60b..e6c6fb2d8e47 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" -- 2.47.3