From: Clément Péron Date: Tue, 26 May 2026 15:57:08 +0000 (+0200) Subject: gh-148557: Use em-config to locate trampoline clang (#148556) X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=1310d2c25242041f0a218012426fba14e756eef8;p=thirdparty%2FPython%2Fcpython.git gh-148557: Use em-config to locate trampoline clang (#148556) 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. --- diff --git a/Makefile.pre.in b/Makefile.pre.in index 242aca0dc05e..2b34b009fd74 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -3139,7 +3139,7 @@ Python/asm_trampoline_universal2.o: $(srcdir)/Python/asm_trampoline_aarch64.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