714b0a816b
The native-EH migration pointed apply-finalize.sh at emsdk's bundled
wasm-emscripten-finalize (${EMSDK:-tools/emsdk}/upstream/bin), which exists on a
dev machine (tools/emsdk persists from a prior build) but never on the ephemeral
CI host — emsdk lives only inside the Docker image, and nothing on the host
post-process path provisions it. So the host post-process died at finalize for
every app once the binaryen-SHA cache re-key forced it to actually run. (Not the
missing-ninja theory — ninja was installed; the run never reached the wasm-opt
build, which is downstream of finalize.)
Finish the "Binaryen submodule everywhere" migration: build-wasm-opt.sh now also
builds wasm-emscripten-finalize, and apply-finalize.sh takes it from that build
(next to wasm-opt). The host post-process is now emsdk-free (dyncall=node,
finalize+asyncify=submodule v130) and finalize/wasm-opt share one Binaryen
version (previously finalize was emsdk's v121, wasm-opt the submodule's v130).
get-wasm-opt.sh stays for bench only; dropped it from the wasm cache key and
added build-wasm-opt.sh.
Also surface the from-source Binaryen build as a "Build Binaryen" stage in
build-monitor.sh (it had no marker), emitted at the pipelined pre-warm sites.
Validated: a clean from-scratch `docker/build.sh calculator --build-deps` (deps +
compile + finalize via the submodule binary + asyncify + -O2) succeeded
end-to-end; finalize resolved to build-wasm/tools/binaryen-hoist-build/bin.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
44 lines
1.6 KiB
Shell
Executable file
44 lines
1.6 KiB
Shell
Executable file
#!/bin/bash
|
|
# Apply wasm-emscripten-finalize transformation on host.
|
|
#
|
|
# Usage: ./scripts/common/apply-finalize.sh <input.wasm> <output.wasm>
|
|
|
|
set -e
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)"
|
|
|
|
# wasm-emscripten-finalize comes from our Binaryen submodule (version_130 + --hoist-cpp-catches),
|
|
# built alongside wasm-opt by build-wasm-opt.sh. Pinning finalize and the asyncify wasm-opt to ONE
|
|
# Binaryen version removes the host's emsdk dependency from the post-process entirely (it is now
|
|
# dyncall=node + finalize/asyncify=submodule), which is what was breaking on the ephemeral CI host.
|
|
# HOIST_WASMOPT, when the build driver pre-warms the submodule build, points at the already-built
|
|
# wasm-opt so we don't re-invoke the build per app; finalize sits next to it in the same bin/.
|
|
WASM_OPT="${HOIST_WASMOPT:-$("${SCRIPT_DIR}/../binaryen-hoist-pass/build-wasm-opt.sh")}"
|
|
FINALIZE="$(dirname "${WASM_OPT}")/wasm-emscripten-finalize"
|
|
|
|
INPUT_WASM="${1:-output/pcbnew.wasm}"
|
|
OUTPUT_WASM="${2:-${INPUT_WASM}}"
|
|
|
|
if [ ! -f "${INPUT_WASM}" ]; then
|
|
echo "ERROR: Input file not found: ${INPUT_WASM}"
|
|
exit 1
|
|
fi
|
|
|
|
echo "Applying wasm-emscripten-finalize..."
|
|
echo " Input: ${INPUT_WASM}"
|
|
echo " Output: ${OUTPUT_WASM}"
|
|
echo " Tool: ${FINALIZE}"
|
|
|
|
# Run finalize with the same flags Emscripten would use
|
|
# NOTE: --dwarf removed because debug info is in separate .debug.wasm file
|
|
"${FINALIZE}" \
|
|
-g \
|
|
--bigint \
|
|
--no-legalize-javascript-ffi \
|
|
--detect-features \
|
|
"${INPUT_WASM}" \
|
|
-o "${OUTPUT_WASM}"
|
|
|
|
echo "Finalize complete: ${OUTPUT_WASM}"
|
|
ls -lh "${OUTPUT_WASM}"
|