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>
36 lines
1.7 KiB
Shell
Executable file
36 lines
1.7 KiB
Shell
Executable file
#!/bin/bash
|
|
# Build the host post-process Binaryen tools from our submodule: wasm-opt (with the
|
|
# catch-arm-hoisting pass, --hoist-cpp-catches) AND wasm-emscripten-finalize.
|
|
#
|
|
# Source of truth is the tracked Binaryen submodule (binaryen/, branch wasm-port =
|
|
# upstream version_130 + src/passes/HoistCppCatches.cpp). This configures an out-of-source
|
|
# build into the gitignored build-wasm/ tree and prints the wasm-opt path on stdout
|
|
# (build progress to stderr); wasm-emscripten-finalize lands next to it in the same bin/
|
|
# (apply-finalize.sh derives it from the wasm-opt dir). Building both from one submodule
|
|
# keeps finalize and asyncify on a single Binaryen version and removes the host emsdk
|
|
# dependency from the post-process. See docs/features/wasm-exceptions/06-spike-plan.md (Phase 1.5).
|
|
set -eo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
PROJECT_ROOT="$(cd "${SCRIPT_DIR}/../.." && pwd)"
|
|
SRC="${PROJECT_ROOT}/binaryen"
|
|
BUILD="${PROJECT_ROOT}/build-wasm/tools/binaryen-hoist-build"
|
|
|
|
if [ ! -f "${SRC}/src/passes/HoistCppCatches.cpp" ]; then
|
|
echo "ERROR: binaryen submodule is missing the hoist pass." >&2
|
|
echo " Run: git submodule update --init binaryen" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Configure once (mirrors scripts/common/get-wasm-opt.sh's from-source flags).
|
|
if [ ! -f "${BUILD}/build.ninja" ]; then
|
|
echo "Configuring Binaryen submodule build (one-time, ~5 min to build)..." >&2
|
|
cmake -S "${SRC}" -B "${BUILD}" -G Ninja \
|
|
-DCMAKE_BUILD_TYPE=Release \
|
|
-DCMAKE_CXX_FLAGS="-Wno-maybe-uninitialized" \
|
|
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DBUILD_TESTS=OFF >&2
|
|
fi
|
|
|
|
ninja -C "${BUILD}" wasm-opt wasm-emscripten-finalize >&2
|
|
|
|
echo "${BUILD}/bin/wasm-opt"
|