https://github.com/python/cpython/commit/8732053c92fdf3120e94ea2b8fc2d39b372f0602 commit: 8732053c92fdf3120e94ea2b8fc2d39b372f0602 branch: 3.14 author: Miss Islington (bot) <[email protected]> committer: emmatyping <[email protected]> date: 2026-05-26T10:05:51-07:00 summary:
[3.14] gh-148557: Use em-config to locate trampoline clang (GH-148556) (#150482) 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. (cherry picked from commit 1310d2c25242041f0a218012426fba14e756eef8) Co-authored-by: Clément Péron <[email protected]> files: M Makefile.pre.in diff --git a/Makefile.pre.in b/Makefile.pre.in index ce320042bbf043..f86d7363e0900f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -3112,7 +3112,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 _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3//lists/python-checkins.python.org Member address: [email protected]
