Unix

Author: SingleAccretion

eng/native/gen-buildsys.sh

@@ -97,9 +97,26 @@ fi
 cmake_extra_defines_wasm=()
 if [[ "$host_arch" == "wasm" ]]; then
     if [[ "$target_os" == "browser" ]]; then
+        if [[ -z "$EMSDK_PATH" ]]; then
+            if [[ -d "$reporoot"/src/mono/browser/emsdk/ ]]; then
+                export EMSDK_PATH="$reporoot"/src/mono/browser/emsdk/
+            else
+                echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
+                exit 1
+            fi
+        fi
+        export EMSDK_QUIET=1 && source "$EMSDK_PATH"/emsdk_env.sh
         cmake_command="emcmake $cmake_command"
     elif [[ "$target_os" == "wasi" ]]; then
-        cmake_extra_defines_wasm=("-DCLR_CMAKE_TARGET_OS=wasi" "-DCLR_CMAKE_TARGET_ARCH=wasm" "-DWASI_SDK_PREFIX=$WASI_SDK_PATH" "-DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_PATH}/share/cmake/wasi-sdk-p2.cmake" "-DCMAKE_SYSROOT=${WASI_SDK_PATH}/share/wasi-sysroot" "-DCMAKE_CROSSCOMPILING_EMULATOR=node --experimental-wasm-bigint --experimental-wasi-unstable-preview1")
+        if [[ -z "$WASI_SDK_PATH" ]]; then
+            if [[ -d "$reporoot"/src/mono/wasi/wasi-sdk ]]; then
+                export WASI_SDK_PATH="$reporoot"/src/mono/wasi/wasi-sdk
+            else
+                echo "Error: You need to set the WASI_SDK_PATH environment variable pointing to the WASI SDK root."
+                exit 1
+            fi
+        fi
+        cmake_extra_defines_wasm=("-DCLR_CMAKE_TARGET_OS=wasi" "-DCLR_CMAKE_TARGET_ARCH=wasm" "-DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_PATH}/share/cmake/wasi-sdk-p2.cmake" "-DCMAKE_CROSSCOMPILING_EMULATOR=node --experimental-wasm-bigint --experimental-wasi-unstable-preview1")
     else
         echo "target_os was not specified"
         exit 1

src/native/libs/build-native.sh

@@ -53,31 +53,7 @@ __usePThreads=0
 source "$__RepoRootDir"/eng/native/build-commons.sh
 
 # Set cross build
-if [[ "$__TargetOS" == browser ]]; then
-    if [[ -z "$EMSDK_PATH" ]]; then
-        if [[ -d "$__RepoRootDir"/src/mono/browser/emsdk/ ]]; then
-            export EMSDK_PATH="$__RepoRootDir"/src/mono/browser/emsdk/
-        else
-            echo "Error: You need to set the EMSDK_PATH environment variable pointing to the emscripten SDK root."
-            exit 1
-        fi
-    fi
-    source "$EMSDK_PATH"/emsdk_env.sh
-    export CLR_CC=$(which emcc)
-elif [[ "$__TargetOS" == wasi ]]; then
-    if [[ -z "$WASI_SDK_PATH" ]]; then
-        if [[ -d "$__RepoRootDir"/src/mono/wasi/wasi-sdk ]]; then
-            export WASI_SDK_PATH="$__RepoRootDir"/src/mono/wasi/wasi-sdk
-        else
-            echo "Error: You need to set the WASI_SDK_PATH environment variable pointing to the WASI SDK root."
-            exit 1
-        fi
-    fi
-    export WASI_SDK_PATH="${WASI_SDK_PATH%/}/"
-    export CLR_CC="$WASI_SDK_PATH"bin/clang
-    export TARGET_BUILD_ARCH=wasm
-    __CMakeArgs="-DCLR_CMAKE_TARGET_OS=wasi -DCLR_CMAKE_TARGET_ARCH=wasm -DWASI_SDK_PREFIX=$WASI_SDK_PATH -DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_PATH}/share/cmake/wasi-sdk-p2.cmake $__CMakeArgs"
-elif [[ "$__TargetOS" == ios || "$__TargetOS" == iossimulator ]]; then
+if [[ "$__TargetOS" == browser || "$__TargetOS" == wasi || "$__TargetOS" == ios || "$__TargetOS" == iossimulator ]]; then
     # nothing to do here
     true
 elif [[ "$__TargetOS" == tvos || "$__TargetOS" == tvossimulator ]]; then