Use Joel's test build of WASI-SDK with dylib support for building the engine

Author: tschneidereit

.github/workflows/main.yml

@@ -31,6 +31,9 @@ jobs:
       run: |
         mkdir dist
         sudo apt-get update -y
+        wget https://github.com/dicej/wasi-sdk/releases/download/filesystem-fix-v3/wasi-sdk-20.25g964191c91aac-linux.tar.gz
+        tar -xvf wasi-sdk-20.25g964191c91aac-linux.tar.gz
+        export WASI_SDK_PREFIX=$PWD/wasi-sdk-20.25g964191c91aac
         bash ./build-engine.sh release
         tar -a -cf dist/spidermonkey-wasm-static-lib_release.tar.gz release
         rm -rf release obj-release

build-engine.sh

@@ -82,13 +82,15 @@ if [[ ! -a gecko-dev ]]; then
     origin "$(cat "$script_dir/gecko-repository")"
 
   fetch_commits=1
+else
 fi
 
 target_rev="$(cat "$script_dir/gecko-revision")"
 if [[ -n "$fetch_commits" ]] || \
   [[ "$(git -C gecko-dev rev-parse HEAD)" != "$target_rev" ]]; then
   git -C gecko-dev fetch --depth 1 origin "$target_rev"
   git -C gecko-dev checkout FETCH_HEAD
+else
 fi
 
 # Use Gecko's build system bootstrapping to ensure all dependencies are
@@ -110,6 +112,15 @@ python3 \
 
 cd "$working_dir"
 
+if [[ -z "${WASI_SDK_PREFIX}" ]]; then
+  echo "WASI_SDK_PREFIX not set, using default compiler and sysroot"
+else
+  mv ~/.mozbuild/clang ~/.mozbuild/clang.orig
+  mv ~/.mozbuild/sysroot-wasm32-wasi ~/.mozbuild/sysroot-wasm32-wasi.orig
+  ln -s "${WASI_SDK_PREFIX}" ~/.mozbuild/clang
+  ln -s "${WASI_SDK_PREFIX}/share/wasi-sysroot" ~/.mozbuild/sysroot-wasm32-wasi
+fi
+
 # Build SpiderMonkey for WASI
 MOZCONFIG="${mozconfig}" \
 MOZ_FETCHES_DIR=~/.mozbuild \