build-wasi.sh: Move some settings to mpconfigvariant.mk.

yamt · yamt · commit 5919a5744d08 · 2025-05-28T13:24:42.000+09:00
Signed-off-by: YAMAMOTO Takashi &lt;yamamoto@midokura.com&gt;
diff --git a/ports/unix/build-wasi.sh b/ports/unix/build-wasi.sh
@@ -1,31 +1,8 @@
 #! /bin/sh
 
-# prerequisites
-#
-# WASI_SDK: wasi-sdk 25.0 or later
-# WASM_OPT: binaryen wasm-opt version_117 or later
-
-# Note:
-# we specify the target "--target=wasm32-wasi" explicitly below for the case
-# where $CLANG is built with a configuration different from wasi-sdk.
-# ditto for "-B ${WASI_SDK}/bin/".
-
 set -e
 
-WASI_SDK=${WASI_SDK:-/opt/wasi-sdk-25.0}
-WASI_SYSROOT=${WASI_SYSROOT:-${WASI_SDK}/share/wasi-sysroot}
-WASM_OPT=${WASM_OPT:-wasm-opt}
-RESOURCE_DIR=$(${WASI_SDK}/bin/clang --print-resource-dir)
-LLVM_DIR=${LLVM_DIR:-${WASI_SDK}}
-CLANG=${CLANG:-${LLVM_DIR}/bin/clang}
-CC="${CLANG} --sysroot ${WASI_SYSROOT} -resource-dir ${RESOURCE_DIR}"
-
-CFLAGS="--target=wasm32-wasi -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_MMAN -mllvm -wasm-enable-sjlj" \
-LDFLAGS="--target=wasm32-wasi -lwasi-emulated-process-clocks -lwasi-emulated-signal -lwasi-emulated-mman -lsetjmp -B ${WASI_SDK}/bin/" \
 make \
-CC="${CC}" \
-STRIP="${WASI_SDK}/bin/strip" \
-SIZE="${WASI_SDK}/bin/size" \
 UNAME_S=wasi \
 VARIANT=wasi \
 "$@"
diff --git a/ports/unix/variants/wasi/mpconfigvariant.mk b/ports/unix/variants/wasi/mpconfigvariant.mk
@@ -1,3 +1,28 @@
+# prerequisites
+#
+# WASI_SDK: wasi-sdk 25.0 or later
+# WASM_OPT: binaryen wasm-opt version_117 or later
+
+# Note:
+# we specify the target "--target=wasm32-wasi" explicitly below for the case
+# where $CLANG is built with a configuration different from wasi-sdk.
+# ditto for "-B ${WASI_SDK}/bin/".
+
+WASI_SDK = /opt/wasi-sdk-25.0
+WASI_SYSROOT = $(WASI_SDK)/share/wasi-sysroot
+WASM_OPT = wasm-opt
+RESOURCE_DIR = $(shell $(WASI_SDK)/bin/clang --print-resource-dir)
+LLVM_DIR = $(WASI_SDK)
+CLANG = $(LLVM_DIR)/bin/clang
+
+CC = $(CLANG) --sysroot $(WASI_SYSROOT) -resource-dir $(RESOURCE_DIR)
+STRIP = $(WASI_SDK)/bin/strip
+SIZE = $(WASI_SDK)/bin/size
+
+CFLAGS += --target=wasm32-wasi -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_MMAN -mllvm -wasm-enable-sjlj
+
+LDFLAGS += --target=wasm32-wasi -lwasi-emulated-process-clocks -lwasi-emulated-signal -lwasi-emulated-mman -lsetjmp -B ${WASI_SDK}/bin/
+
 # WASI doesn't have FFI
 MICROPY_PY_FFI = 0
 
