From 2f26237b8b6b0bd65d2fd53488adf9d71fbc4a83 Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Wed, 25 Mar 2026 12:39:20 +0000 Subject: [PATCH] GHA: main.yml/main-aarch64.yml: WASM build -DEMSCRIPTEN=1 appears to not be present any more by default in emcc compiler. There is -D__EMSCRIPTEN__=1 but that would require modifying many locations in the codebase which are already being reviewed separately under a single source multi-platform build cleanup process. Anyhow maybe ./configure would set -DEMSCRIPTEN=1 itself, much like -Dlinux=1 for other targets. This commits defers evaluation on that until later and just restores how it worked before. --- .github/workflows/main-aarch64.yml | 14 +++++++++++++- .github/workflows/main.yml | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main-aarch64.yml b/.github/workflows/main-aarch64.yml index 4671f60c..e4e3fc9c 100644 --- a/.github/workflows/main-aarch64.yml +++ b/.github/workflows/main-aarch64.yml @@ -33,10 +33,22 @@ jobs: cd emsdk ./emsdk install latest ./emsdk activate latest + - name: Emscripten Diagnostic + run: | + source ./emsdk/emsdk_env.sh + echo "===== gcc -dM -E - =====" + echo | gcc -dM -E - | sort + echo "===== g++ -dM -E - =====" + echo | g++ -dM -E - | sort + echo "===== emcc -dM -E - =====" + echo | emcc -dM -E - | sort + echo "===== em++ -dM -E - =====" + echo | em++ -dM -E - | sort - name: Build run: | source ./emsdk/emsdk_env.sh - emconfigure ./configure --without-cairo --without-opengl --without-x --disable-readline --disable-compression --target=asmjs-unknown-emscripten + # The --without and --disable in these build options is due to no WASM library being available for that feature + CFLAGS="--std=c17 -D_DEFAULT_SOURCE=1 -DEMSCRIPTEN=1 -g" emconfigure ./configure --without-cairo --without-opengl --without-x --without-tk --without-tcl --disable-readline --disable-compression --target=asmjs-unknown-emscripten echo "===== defs.mak =====" cat defs.mak echo "===== defs.mak =====" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 37dfd826..8a64284a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,10 +32,22 @@ jobs: cd emsdk ./emsdk install latest ./emsdk activate latest + - name: Emscripten Diagnostic + run: | + source ./emsdk/emsdk_env.sh + echo "===== gcc -dM -E - =====" + echo | gcc -dM -E - | sort + echo "===== g++ -dM -E - =====" + echo | g++ -dM -E - | sort + echo "===== emcc -dM -E - =====" + echo | emcc -dM -E - | sort + echo "===== em++ -dM -E - =====" + echo | em++ -dM -E - | sort - name: Build run: | source ./emsdk/emsdk_env.sh - emconfigure ./configure --without-cairo --without-opengl --without-x --disable-readline --disable-compression --target=asmjs-unknown-emscripten + # The --without and --disable in these build options is due to no WASM library being available for that feature + CFLAGS="--std=c17 -D_DEFAULT_SOURCE=1 -DEMSCRIPTEN=1 -g" emconfigure ./configure --without-cairo --without-opengl --without-x --without-tk --without-tcl --disable-readline --disable-compression --target=asmjs-unknown-emscripten echo "===== defs.mak =====" cat defs.mak echo "===== defs.mak ====="