Skip to content

GH-113516: don't set LDSHARED when building for WASI #115495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 15, 2024
Merged

GH-113516: don't set LDSHARED when building for WASI #115495

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98ad9c1
GH-113516: don't set `LDSHARED` when building for WASI
brettcannon Feb 14, 2024
1637931
Fix a reST issue
brettcannon Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Tools-Demos/2024-02-14-15-58-13.gh-issue-113516.TyIHWx.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Don't set `LDSHARED` when building for WASI.
1 change: 0 additions & 1 deletion Tools/wasm/wasi-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion Tools/wasm/wasi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down