Skip to content

Commit 18343c0

Browse files
authored
GH-113516: don't set LDSHARED when building for WASI (GH-115495)
1 parent 4684301 commit 18343c0

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Don't set ``LDSHARED`` when building for WASI.

Tools/wasm/wasi-env

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ if command -v ccache >/dev/null 2>&1; then
5555
CXX="ccache ${CXX}"
5656
fi
5757

58-
LDSHARED="${WASI_SDK_PATH}/bin/wasm-ld"
5958
AR="${WASI_SDK_PATH}/bin/llvm-ar"
6059
RANLIB="${WASI_SDK_PATH}/bin/ranlib"
6160

Tools/wasm/wasi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def wasi_sdk_env(context):
165165
wasi_sdk_path = context.wasi_sdk_path
166166
sysroot = wasi_sdk_path / "share" / "wasi-sysroot"
167167
env = {"CC": "clang", "CPP": "clang-cpp", "CXX": "clang++",
168-
"LDSHARED": "wasm-ld", "AR": "llvm-ar", "RANLIB": "ranlib"}
168+
"AR": "llvm-ar", "RANLIB": "ranlib"}
169169

170170
for env_var, binary_name in list(env.items()):
171171
env[env_var] = os.fsdecode(wasi_sdk_path / "bin" / binary_name)

0 commit comments

Comments
 (0)