Skip to content

gh-148557: Makefile.pre.in: use em-config for trampoline clang #148556

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

Open
clementperon wants to merge 3 commits into
base: main
Choose a base branch
from
+2 −1
Open

gh-148557: Makefile.pre.in: use em-config for trampoline clang #148556

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a54dd2
Makefile.pre.in: use em-config for trampoline clang
clementperon Apr 14, 2026
166dd8c
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 23, 2026
8a7f6bf
Merge branch 'main' into patch-1
clementperon Apr 23, 2026
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
Next Next commit
Makefile.pre.in: use em-config for trampoline clang 
When CC is wrapped by ccache, the Emscripten trampoline rule cannot derive the
matching clang path by treating CC as a single executable path. Query the active
LLVM toolchain path with em-config instead.
  • Loading branch information
@clementperon
clementperon committed Apr 14, 2026
commit 3a54dd23b8099aa1f39b29500b9148312c9b9d5b
2 changes: 1 addition & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3173,7 +3173,7 @@ Python/asm_trampoline.o: $(srcdir)/Python/asm_trampoline.S

Python/emscripten_trampoline_inner.wasm: $(srcdir)/Python/emscripten_trampoline_inner.c
# emcc has a path that ends with emsdk/upstream/emscripten/emcc, we're looking for emsdk/upstream/bin/clang.
$$(dirname $$(dirname $(CC)))/bin/clang -o $@ $< -mgc -O2 -Wl,--no-entry -Wl,--import-table -Wl,--import-memory -target wasm32-unknown-unknown -nostdlib
$$(em-config LLVM_ROOT)/clang -o $@ $< -mgc -O2 -Wl,--no-entry -Wl,--import-table -Wl,--import-memory -target wasm32-unknown-unknown -nostdlib

Python/emscripten_trampoline_wasm.c: Python/emscripten_trampoline_inner.wasm
$(PYTHON_FOR_REGEN) $(srcdir)/Platforms/emscripten/prepare_external_wasm.py $< $@ getWasmTrampolineModule
Expand Down
Loading