@ai-ecoverse/wasm-emscripten 6.0.9-5 → 6.0.9-6

package/README.md

@@ -14,6 +14,17 @@ pointing at this package's config.
 | `@ai-ecoverse/emscripten-cache` | Read-only prebuilt `sysroot/` |
 | `esbuild-wasm@0.28.2` | SLICC `node` ESM/TLA transpile (`compiler.mjs`, …) |
 | `typescript@6.0.3` | Fallback transpile path when esbuild is unavailable |
+| `acorn` / `acorn-import-phases` | JS optimizer (`acorn-optimizer.mjs`) |
+
+## Default link (wasm realm)
+
+Executable links (not `-c` / `-r` / `-shared`) inject `homescoop_em_cli_ldflags`
+(`-sENVIRONMENT=web,worker,node -sEXIT_RUNTIME=1 -sALLOW_MEMORY_GROWTH=1`) and
+`lib/slicc/{slicc_spawn,slicc_exec,slicc_signals,slicc_select,slicc_libc_gaps,slicc_jobs}.o`.
+Opt out with **`SLICC_EMCC_PLAIN=1`** for plain web glue.
+`lib/slicc/slicc_main_envp.o` (make: `-Dmain=slicc_tool_main`) and
+`lib/slicc/slicc_fork.o` (needs ASYNCIFY) are shipped but not auto-linked.
+Root `$PKG/emcc` (cmake toolchain) and `$PKG/bin/emcc` are the same self-sufficient launcher.
 
 ## CACHE model
 
@@ -26,18 +37,19 @@ pointing at this package's config.
 
 ## SLICC patches (September + homescoop)
 
-1. **`SLICC_VFS_PRE_JS`** — every link gets `lib/slicc-vfs-pre.js` (live VFS mount; no NODERAWFS under slicc)
-2. **Configure patch** — autoconf/conftest skips `NODERAWFS` when the pre-js is set (`patches/emscripten-slicc-configure.patch` in slicc-emscripten)
+1. **Wasm-realm CLI link defaults** — see above; optional `SLICC_VFS_PRE_JS` only when set (node-realm)
+2. **Configure patch** — autoconf/conftest skips `NODERAWFS` under CLI defaults
 3. **`ac_cv_build` seeding** — `emconfigure` sets `ac_cv_build=x86_64-pc-linux-gnu` (and host/target) so `config.guess` is not required in-realm
 4. **Closure unsupported** — `-sCLOSURE=1` / `--closure` fail with: *Closure Compiler is not available in SLICC's Emscripten package*
 5. **Cache erase** — will not delete a symlinked `sysroot`
+6. **`execvpe`** — `tools/utils.py` passes `os.environ` so emconfigure/`emmake` keep `CC=emcc`
 
 ## Commands
 
 `emcc`, `em++`, `emar`, `emranlib`, `emcmake`, `emconfigure`, `emmake`, `embuilder`, `em-config`, `emscan-deps`
 
 ```bash
-emcc hello.c -o hello.js
+emcc hello.c -o hello.js    # runnable in the wasm realm
 emcmake cmake -S . -B build
 emconfigure ./configure --host=wasm32-unknown-emscripten
 ```

package/bin/em++

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/bin/em-config

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/bin/emar

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/bin/embuilder

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/bin/emcc

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/bin/emcmake

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/bin/emconfigure

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/bin/emmake

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/bin/emranlib

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/bin/emscan-deps

@@ -1,11 +1,25 @@
 #!/bin/sh
 # Shared launcher for emcc/em++/emar/… — runs em*.py on wasix-python (-S).
+# Self-sufficient when invoked by path (emcmake toolchain uses $PKG/emcc).
 set -eu
 
 TOOL=$(basename "$0")
 BINDIR=$(CDPATH= cd -- "$(dirname "$0")" && pwd)
-PKG_ROOT=${EM_PACKAGE_ROOT:-$(CDPATH= cd -- "$BINDIR/.." && pwd)}
-export EM_PACKAGE_ROOT=$PKG_ROOT
+
+# $PKG/emcc (cmake / path_from_root) → package root is BINDIR.
+# $PKG/bin/emcc (slicc.commands) → package root is parent.
+if [ -f "$BINDIR/emcc.py" ]; then
+  PKG_ROOT=$BINDIR
+  ENSURE_CACHE=$BINDIR/bin/em-ensure-cache
+elif [ -f "$BINDIR/../emcc.py" ]; then
+  PKG_ROOT=$(CDPATH= cd -- "$BINDIR/.." && pwd)
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+else
+  PKG_ROOT=${EM_PACKAGE_ROOT:-$BINDIR}
+  ENSURE_CACHE=$BINDIR/em-ensure-cache
+fi
+
+export EM_PACKAGE_ROOT=${EM_PACKAGE_ROOT:-$PKG_ROOT}
 export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 
 # Resolve companion packages when slicc.env did not set them.
@@ -15,12 +29,17 @@ export EM_CONFIG=${EM_CONFIG:-$PKG_ROOT/emscripten-config}
 export EM_CACHE_PACKAGE EM_LLVM_PACKAGE EM_BINARYEN_PACKAGE
 
 # Writable user CACHE + sysroot symlink into emscripten-cache.
-CACHE=$("$BINDIR/em-ensure-cache")
+if [ ! -x "$ENSURE_CACHE" ]; then
+  echo "em-launcher: missing $ENSURE_CACHE" >&2
+  exit 1
+fi
+CACHE=$("$ENSURE_CACHE")
 export EM_CACHE=$CACHE
 
-# VFS pre-js for every link (September slicc patch).
-: "${SLICC_VFS_PRE_JS:=$PKG_ROOT/lib/slicc-vfs-pre.js}"
-export SLICC_VFS_PRE_JS
+# libslicc objects for default executable links (link.py); not the node-realm VFS pre-js.
+export SLICC_EM_LIBDIR=${SLICC_EM_LIBDIR:-$PKG_ROOT/lib/slicc}
+# Do NOT default-export SLICC_VFS_PRE_JS — that pre-js reads process.env.SLICC_LIVE_FS
+# (node-realm only) and breaks wasm-realm runnables. Opt in explicitly if needed.
 
 PY=${EMSDK_PYTHON:-}
 if [ -z "$PY" ]; then
@@ -36,7 +55,6 @@ fi
 
 SCRIPT=$PKG_ROOT/${TOOL}.py
 if [ ! -f "$SCRIPT" ]; then
-  # emranlib → emranlib.py; emcmake → emcmake.py; etc.
   case $TOOL in
     em++) SCRIPT=$PKG_ROOT/em++.py ;;
   esac

package/emscripten-config

@@ -29,8 +29,9 @@ FROZEN_CACHE = False
 # cannot reach Java.
 # CLOSURE_COMPILER = None
 
-# September slicc: every link gets the live-VFS pre-js when set.
-os.environ.setdefault('SLICC_VFS_PRE_JS', str(_pkg / 'lib' / 'slicc-vfs-pre.js'))
+# Default links inject homescoop_em_cli_ldflags + lib/slicc/*.o (see link.py).
+# Do not set SLICC_VFS_PRE_JS here — that pre-js is node-realm only.
+os.environ.setdefault('SLICC_EM_LIBDIR', str(_pkg / 'lib' / 'slicc'))
 
 # Silence unused-import lint in some editors; keep roots discoverable.
 _HOMESCOOP_CACHE_PKG = str(_cache_pkg)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/wasm-emscripten",
-  "version": "6.0.9-5",
+  "version": "6.0.9-6",
   "description": "Emscripten 6.0.9 for slicc (emcc via wasix-python)",
   "license": "MIT",
   "repository": {
@@ -45,7 +45,9 @@
     "@ai-ecoverse/wasm-binaryen": "132.0.0-1",
     "@ai-ecoverse/emscripten-cache": "6.0.9-2",
     "esbuild-wasm": "0.28.2",
-    "typescript": "6.0.3"
+    "typescript": "6.0.3",
+    "acorn": "^8.18.0",
+    "acorn-import-phases": "^1.0.4"
   },
   "slicc": {
     "abi": "emscripten",
@@ -55,7 +57,7 @@
       "EM_CACHE_PACKAGE": "/shared/lib/node_modules/@ai-ecoverse/emscripten-cache",
       "EM_LLVM_PACKAGE": "/shared/lib/node_modules/@ai-ecoverse/wasm-clang",
       "EM_BINARYEN_PACKAGE": "/shared/lib/node_modules/@ai-ecoverse/wasm-binaryen",
-      "SLICC_VFS_PRE_JS": "${package}/lib/slicc-vfs-pre.js"
+      "SLICC_EM_LIBDIR": "${package}/lib/slicc"
     },
     "commands": {
       "emcc": {

package/tools/link.py

@@ -848,23 +848,43 @@ def phase_linker_setup(linker_args):  # ruff: ignore[complex-structure, too-many
   if not shared.SKIP_SUBPROCS:
     shared.check_llvm_version()
 
-  # slicc: every program linked there may run there (configure tests, build
-  # helpers like freetype's apinames, tools like pkgconf), in a node realm
-  # whose fs has no file descriptors. The pre-js mounts slicc's live VFS into
-  # the program's FS; it does nothing outside slicc.
+  # Optional node-realm VFS pre-js (explicit SLICC_VFS_PRE_JS only — do not
+  # default this; wasm-realm programs crash on process.env.SLICC_LIVE_FS).
   slicc_pre_js = os.environ.get('SLICC_VFS_PRE_JS')
   if slicc_pre_js and slicc_pre_js not in options.pre_js:
     options.pre_js.append(slicc_pre_js)
-    # The pre-js holds main until the async VFS mount is done.
     settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$addRunDependency', '$removeRunDependency']
 
+  # Default: homescoop_em_cli_ldflags + libslicc objects so linked programs run
+  # in the wasm realm. Opt out with SLICC_EMCC_PLAIN=1 (plain web glue).
+  # Skip for -c (never reaches here), -r, -shared / SIDE_MODULE.
+  plain = os.environ.get('SLICC_EMCC_PLAIN', '').lower() in ('1', 'true', 'yes')
+  if (not plain and not options.shared and not options.relocatable
+      and not settings.SIDE_MODULE):
+    default_setting('ENVIRONMENT', ['web', 'worker', 'node'])
+    default_setting('EXIT_RUNTIME', 1)
+    default_setting('ALLOW_MEMORY_GROWTH', 1)
+    slicc_lib = os.environ.get('SLICC_EM_LIBDIR') or utils.path_from_root('lib', 'slicc')
+    # cli profile (not main_envp — that renames main→slicc_tool_main for make).
+    # slicc_main_envp.o / slicc_fork.o are shipped under lib/slicc/ for opt-in.
+    for obj in (
+        'slicc_spawn.o',
+        'slicc_exec.o',
+        'slicc_signals.o',
+        'slicc_select.o',
+        'slicc_libc_gaps.o',
+        'slicc_jobs.o',
+    ):
+      path = os.path.join(slicc_lib, obj)
+      if os.path.isfile(path) and path not in linker_args:
+        linker_args.append(path)
+
   autoconf = os.environ.get('EMMAKEN_JUST_CONFIGURE') or 'conftest.c' in options.input_files or 'conftest.cpp' in options.input_files
   if autoconf:
     # configure tests want a more shell-like style, where we emit return codes on exit()
     settings.EXIT_RUNTIME = 1
-    # use node.js raw filesystem access, to behave just like a native executable
-    # (in slicc NODERAWFS cannot work; the pre-js above mounts the VFS instead)
-    if not slicc_pre_js:
+    # Host/plain node: NODERAWFS. Wasm-realm CLI defaults use the normal FS.
+    if not slicc_pre_js and plain:
       settings.NODERAWFS = 1
     # Add `#!` line to output JS and make it executable.
     settings.EXECUTABLE = config.NODE_JS[0]

package/tools/utils.py

@@ -67,7 +67,9 @@ def exec(cmd):
   else:
     sys.stdout.flush()
     sys.stderr.flush()
-    os.execvp(cmd[0], cmd)
+    # wasix-python: execvp keeps the process's *initial* environ; execvpe with
+    # an explicit mapping passes updates from os.environ (emconfigure CC=…).
+    os.execvpe(cmd[0], cmd, os.environ)
 
 
 def exit_with_error(msg, *args):