dotnet · lewing · May 22, 2026 · Jun 6, 2026 · Jun 6, 2026 · Jun 6, 2026
diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -33,6 +33,7 @@
 
     <_CoreCLRSupportedOS Condition="'$(TargetsAndroid)' == 'true' and '$(TargetArchitecture)' != 'x86'">true</_CoreCLRSupportedOS>
     <_CoreCLRSupportedOS Condition="'$(TargetsBrowser)' == 'true'">true</_CoreCLRSupportedOS>
+    <_CoreCLRSupportedOS Condition="'$(TargetsWasi)' == 'true'">true</_CoreCLRSupportedOS>
     <_CoreCLRSupportedOS Condition="'$(TargetsAppleMobile)' == 'true'">true</_CoreCLRSupportedOS>
 
     <_CoreCLRSupportedArch Condition="'$(TargetArchitecture)' != 'ppc64le' and '$(TargetArchitecture)' != 's390x'">true</_CoreCLRSupportedArch>
@@ -61,6 +62,7 @@
     <DefaultPrimaryRuntimeFlavor>CoreCLR</DefaultPrimaryRuntimeFlavor>
     <DefaultPrimaryRuntimeFlavor Condition="'$(CoreCLRSupported)' != 'true'">Mono</DefaultPrimaryRuntimeFlavor>
     <DefaultPrimaryRuntimeFlavor Condition="'$(TargetsBrowser)' == 'true' and !$(Subset.ToLowerInvariant().Contains('clr'))">Mono</DefaultPrimaryRuntimeFlavor>
+    <DefaultPrimaryRuntimeFlavor Condition="'$(TargetsWasi)' == 'true' and !$(Subset.ToLowerInvariant().Contains('clr'))">Mono</DefaultPrimaryRuntimeFlavor>
     <PrimaryRuntimeFlavor Condition="'$(PrimaryRuntimeFlavor)' == ''">$(DefaultPrimaryRuntimeFlavor)</PrimaryRuntimeFlavor>
   </PropertyGroup>
 
@@ -98,6 +100,7 @@
     <RuntimeFlavor Condition="'$(TargetsAndroid)' == 'true' and ($(_subset.Contains('+clr+')) or $(_subset.Contains('+clr.')))">CoreCLR</RuntimeFlavor>
     <RuntimeFlavor Condition="'$(TargetsAppleMobile)' == 'true' and ($(_subset.Contains('+clr+')) or $(_subset.Contains('+clr.')))">CoreCLR</RuntimeFlavor>
     <RuntimeFlavor Condition="'$(TargetsBrowser)' == 'true' and ($(_subset.Contains('+clr+')) or $(_subset.Contains('+clr.')))">CoreCLR</RuntimeFlavor>
+    <RuntimeFlavor Condition="'$(TargetsWasi)' == 'true' and ($(_subset.Contains('+clr+')) or $(_subset.Contains('+clr.')))">CoreCLR</RuntimeFlavor>
     <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and '$(TargetsMobile)' == 'true'">Mono</RuntimeFlavor>
     <RuntimeFlavor Condition="'$(RuntimeFlavor)' == '' and ($(_subset.Contains('+mono+')) or $(_subset.Contains('+mono.runtime+'))) and (!$(_subset.Contains('+clr+')) and !$(_subset.Contains('+clr.runtime+')) and !$(_subset.Contains('+clr.corelib+')))">Mono</RuntimeFlavor>
     <RuntimeFlavor Condition="'$(RuntimeFlavor)' == ''">$(PrimaryRuntimeFlavor)</RuntimeFlavor>
@@ -109,6 +112,7 @@
     <DefaultCoreClrSubsets Condition="'$(TargetsAndroid)' == 'true'">clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools</DefaultCoreClrSubsets>
     <DefaultCoreClrSubsets Condition="'$(TargetsAppleMobile)' == 'true'">clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools</DefaultCoreClrSubsets>
     <DefaultCoreClrSubsets Condition="'$(TargetsBrowser)' == 'true'">provision.emsdk+clr.native+clr.corelib+clr.nativecorelib+clr.tools+clr.packages+clr.crossarchtools+libs.native+host.native</DefaultCoreClrSubsets>
+    <DefaultCoreClrSubsets Condition="'$(TargetsWasi)' == 'true'">clr.native+clr.corelib+clr.nativecorelib+clr.tools+clr.packages+clr.crossarchtools+libs.native</DefaultCoreClrSubsets>
     <!-- Even on platforms that do not support the CoreCLR runtime, we still want to build ilasm/ildasm. -->
     <DefaultCoreClrSubsets Condition="'$(RuntimeFlavor)' != 'CoreCLR'">clr.iltools+clr.packages</DefaultCoreClrSubsets>
 

diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
@@ -214,6 +214,14 @@
                                                    $(LibrariesNativeArtifactsPath)libbrotlicommon.a;
                                                    $(LibrariesNativeArtifactsPath)libbrotlidec.a;
                                                    $(LibrariesNativeArtifactsPath)libbrotlienc.a" />
+
+      <!-- Same situation on WASI with CoreCLR: System.IO.Compression.Native/CMakeLists.txt
+           installs libSystem.IO.Compression.Native.a and libz.a directly into the
+           CoreCLR sharedFramework directory for CLR_CMAKE_TARGET_WASI, where they are
+           picked up by RuntimeFiles. Exclude the libs.native copies to avoid duplicates. -->
+      <ExcludeNativeLibrariesRuntimeFiles Condition="'$(TargetsWasi)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'"
+                                          Include="$(LibrariesNativeArtifactsPath)libSystem.IO.Compression.Native.a;
+                                                   $(LibrariesNativeArtifactsPath)libz.a" />
       <LibrariesRuntimeFiles Include="
         $(LibrariesNativeArtifactsPath)*.dat;
         $(LibrariesNativeArtifactsPath)*.dll;
@@ -295,7 +303,7 @@
         IsNative="true" />
     </ItemGroup>
 
-    <ItemGroup Label="Wasi" Condition="'$(TargetOS)' == 'wasi'">
+    <ItemGroup Label="Wasi" Condition="'$(TargetOS)' == 'wasi' and '$(RuntimeFlavor)' == 'Mono'">
       <LibrariesRuntimeFiles
                              Include="
         $(LibrariesNativeArtifactsPath)dotnet.wasm;
@@ -317,6 +325,12 @@
         IsNative="true" />
     </ItemGroup>
 
+    <!-- WASI CoreCLR ships only the static runtime libraries (already
+         provided by RuntimeFiles from $(CoreCLRSharedFrameworkDir)) and
+         the libs.native static libs (already provided by the unconditional
+         glob above). corerun.wasm is not part of the runtime pack. -->
+
+
     <Error Condition="'@(LibrariesRuntimeFiles)' == ''" Text="The 'libs' subset must be built before building this project." />
   </Target>
 

diff --git a/eng/native.wasm.targets b/eng/native.wasm.targets
@@ -1,5 +1,7 @@
 <Project>
   <Import Project="$(RepositoryEngineeringDir)AcquireEmscriptenSdk.targets" />
+  <Import Project="$(RepositoryEngineeringDir)AcquireWasiSdk.targets"
+          Condition="'$(TargetsWasi)' == 'true' and Exists('$(RepositoryEngineeringDir)AcquireWasiSdk.targets')" />
 
   <!-- These packages provide ICU and timezone data paths for the native build (CMake).
        Skip them during app-level relink (IsBrowserWasmProject) since the runtime pack
@@ -39,6 +41,16 @@
       <NativeCMakeArg Include="-cmakeargs &quot;-DFEATURE_PERFTRACING_DISABLE_PERFTRACING_LISTEN_PORTS=1&quot;" />
       <NativeCMakeArg Include="-cmakeargs &quot;-DFEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT=1&quot;" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetsWasi)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'">
+      <NativeCMakeArg Include="-cmakeargs &quot;-DGEN_PINVOKE=1&quot;" />
+      <!-- Initial WASI bring-up disables EventPipe / diagnostic-server PAL
+           via FEATURE_PERFTRACING=0 in src/coreclr/CMakeLists.txt; the
+           PERFTRACING_DISABLE_* flags are unused while PERFTRACING is off
+           but kept for symmetry with browser-CoreCLR and for when we
+           re-enable PERFTRACING in a follow-up. -->
+      <NativeCMakeArg Include="-cmakeargs &quot;-DFEATURE_PERFTRACING_DISABLE_PERFTRACING_LISTEN_PORTS=1&quot;" />
+      <NativeCMakeArg Include="-cmakeargs &quot;-DFEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT=1&quot;" />
+  </ItemGroup>
   <ItemGroup Condition="'$(FeatureMultithreading)' != 'true'">
       <NativeCMakeArg Include="-cmakeargs &quot;-DFEATURE_PERFTRACING_DISABLE_THREADS=1&quot;" />
   </ItemGroup>

diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
@@ -855,6 +855,9 @@ if(CLR_CMAKE_TARGET_UNIX)
   if(CLR_CMAKE_TARGET_BROWSER)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_BROWSER>)
   endif()
+  if(CLR_CMAKE_TARGET_WASI)
+    add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_WASI>)
+  endif()
 elseif(CLR_CMAKE_TARGET_WASI)
   add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_OS>>>:TARGET_WASI>)
 else(CLR_CMAKE_TARGET_UNIX)

diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake
@@ -221,6 +221,7 @@ endif(CLR_CMAKE_HOST_OS STREQUAL emscripten)
 
 if(CLR_CMAKE_TARGET_OS STREQUAL wasi)
     set(CLR_CMAKE_HOST_WASI 1)
+    set(CLR_CMAKE_HOST_UNIX 1)
 endif(CLR_CMAKE_TARGET_OS STREQUAL wasi)
 
 #--------------------------------------------
@@ -436,6 +437,7 @@ if(CLR_CMAKE_TARGET_OS STREQUAL emscripten OR CLR_CMAKE_TARGET_OS STREQUAL brows
 endif(CLR_CMAKE_TARGET_OS STREQUAL emscripten OR CLR_CMAKE_TARGET_OS STREQUAL browser)
 
 if(CLR_CMAKE_TARGET_OS STREQUAL wasi)
+    set(CLR_CMAKE_TARGET_UNIX 1)
     set(CLR_CMAKE_TARGET_WASI 1)
 endif(CLR_CMAKE_TARGET_OS STREQUAL wasi)
 
@@ -522,7 +524,36 @@ else()
             add_compile_options(-msimd128)
         endif()
         if(CLR_CMAKE_TARGET_WASI)
-            add_compile_options(-fexceptions)
+            # Native wasm exceptions: sjlj cannot handle the interpreter's
+            # ResumeAfterCatch (throw-from-catch). -wasm-use-legacy-eh=false
+            # selects the new try_table/throw_ref proposal that wasmtime 45+
+            # supports natively; legacy would require --legacy-exceptions.
+            add_compile_options(-fwasm-exceptions)
+            add_compile_options(-mllvm -wasm-use-legacy-eh=false)
+
+            # Suppress CMake's default -lstdc++; wasi-sdk has libc++ only and
+            # we link the eh-flavored variant explicitly below.
+            set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "" CACHE STRING "" FORCE)
+            set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
+            set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "" CACHE STRING "" FORCE)
+            set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
+
+            add_link_options(-fwasm-exceptions)
+            add_link_options(-mllvm -wasm-use-legacy-eh=false)
+            add_link_options(-Wno-unused-command-line-argument)
+            add_link_options(-Wl,--error-limit=0)
+
+            add_link_options(-lc)
+            add_link_options(-lc++)
+            add_link_options(-lc++abi)
+            add_link_options(-lunwind)
+            add_link_options(-ldl)
+
+            # WASI emulated libc helpers the CoreCLR PAL pulls in.
+            add_link_options(-lwasi-emulated-process-clocks)
+            add_link_options(-lwasi-emulated-signal)
+            add_link_options(-lwasi-emulated-mman)
+            add_link_options(-lwasi-emulated-getpid)
         endif()
     endif()
 endif()

diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake
@@ -565,8 +565,8 @@ function(install_clr)
 
     foreach(destination ${destinations})
       # CMake bug with executable WASM outputs - https://gitlab.kitware.com/cmake/cmake/-/issues/20745
-      if (CLR_CMAKE_TARGET_ARCH_WASM AND "${targetType}" STREQUAL "EXECUTABLE")
-        # Use install FILES since these are WASM assets that aren't executable.
+      if (CLR_CMAKE_TARGET_BROWSER AND "${targetType}" STREQUAL "EXECUTABLE")
+        # Emscripten produces a .js + .wasm pair; install both as data files.
         install(FILES
           "$<TARGET_FILE_DIR:${targetName}>/${targetName}.js"
           "$<TARGET_FILE_DIR:${targetName}>/${targetName}.wasm"
@@ -580,6 +580,13 @@ function(install_clr)
           endif()
         "
         COMPONENT ${INSTALL_CLR_COMPONENT} ${INSTALL_CLR_OPTIONAL})
+      elseif (CLR_CMAKE_TARGET_WASI AND "${targetType}" STREQUAL "EXECUTABLE")
+        # wasi-sdk produces a single .wasm binary (the executable itself, no
+        # extension). Install it as a data file — making it PROGRAMS would
+        # require execute permission on a wasm file which the host runtime
+        # (wasmtime) doesn't need.
+        install(FILES $<TARGET_FILE:${targetName}>
+          DESTINATION ${destination} COMPONENT ${INSTALL_CLR_COMPONENT} ${INSTALL_CLR_OPTIONAL})
       else()
         # We don't need to install the export libraries for our DLLs
         # since they won't be directly linked against.

@@ -0,0 +1,38 @@
+parameters:
+  condition: false
+  extraBuildArgs: ''
+  isExtraPlatformsBuild: false
+  nameSuffix: ''
+  platforms: []
+  publishArtifactsForWorkload: false
+
+jobs:
+
+#
+# Build CoreCLR + libraries for WASI (wasm32-wasi).
+#
+# Produces a runtime pack + corerun.wasm artifact under
+# wasi.wasm.Release. The companion pipeline that actually runs the
+# src/tests CoreCLR runtime tests on Helix under wasmtime lives in
+# wasi-wasm-coreclr-runtime-tests.yml (the 'wasi_wasm' Helix queue is
+# already mapped to the ubuntu-26.04-helix-webassembly-amd64 image,
+# which ships wasmtime — see eng/pipelines/libraries/helix-queues-setup.yml).
+#
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/global-build-job.yml
+    buildConfig: Release
+    runtimeFlavor: CoreCLR
+    platforms: ${{ parameters.platforms }}
+    jobParameters:
+      isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
+      testGroup: innerloop
+      nameSuffix: CoreCLR${{ parameters.nameSuffix }}_BuildOnly
+      buildArgs: -s clr+libs+packs -c $(_BuildConfig) ${{ parameters.extraBuildArgs }} /p:TestAssemblies=false
+      timeoutInMinutes: 120
+      condition: ${{ parameters.condition }}
+      postBuildSteps:
+        - template: /eng/pipelines/common/wasm-post-build-steps.yml
+          parameters:
+            publishArtifactsForWorkload: ${{ parameters.publishArtifactsForWorkload }}
+            publishWBT: false
@@ -0,0 +1,68 @@
+parameters:
+  alwaysRun: false
+  isExtraPlatformsBuild: false
+  isWasmOnlyBuild: false
+  platforms: []
+  extraBuildArgs: ''
+
+jobs:
+
+#
+# Build CoreCLR + libraries for WASI and run a subset of src/tests on
+# Helix under wasmtime. Mirrors wasm-runtime-tests.yml (Mono variant),
+# with runtimeFlavor=coreclr and a curated -tree: subset (see
+# src/coreclr/wasi/tests/README.md).
+#
+# Merged-runner mode; xharness dispatches via helixpublishwitharcade.proj.
+# Reuses the wasi_wasm helix queue (ubuntu-26.04-helix-webassembly-amd64).
+#
+
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/common/global-build-job.yml
+    helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+    buildConfig: Release
+    runtimeFlavor: coreclr
+    platforms: ${{ parameters.platforms }}
+    variables:
+      - name: alwaysRunVar
+        value: ${{ parameters.alwaysRun }}
+      - name: timeoutPerTestInMinutes
+        value: 10
+      - name: timeoutPerTestCollectionInMinutes
+        value: 200
+      - name: shouldRunOnDefaultPipelines
+        value: $[
+          or(
+            eq(variables['wasmDarcDependenciesChanged'], true),
+            eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true),
+            eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_wasm_coreclr_runtimetests.containsChange'], true))
+          ]
+    jobParameters:
+      testGroup: innerloop
+      isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
+      nameSuffix: CoreCLR_WASI_RuntimeTests
+      buildArgs: -s clr+libs+packs -c $(_BuildConfig) ${{ parameters.extraBuildArgs }} /p:TestAssemblies=false
+      timeoutInMinutes: 180
+      condition: >-
+        or(
+          eq(variables['alwaysRunVar'], true),
+          eq(variables['isDefaultPipeline'], variables['shouldRunOnDefaultPipelines']))
+      postBuildSteps:
+        - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
+          parameters:
+            creator: dotnet-bot
+            testRunNamePrefixSuffix: CoreCLR_WASI_$(_BuildConfig)
+            # Curated test-tree subset -- expand as gates stabilize.
+            testBuildArgs: >-
+              -priority1
+              -tree:JIT/CodeGenBringUpTests
+              -tree:JIT/Generics
+              -tree:JIT/Directed
+              -tree:JIT/opt
+              -tree:JIT/jit64
+              -tree:Loader
+              -tree:Exceptions
+              -tree:reflection
+      extraVariablesTemplates:
+        - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
@@ -142,6 +142,29 @@ extends:
                 eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'], true),
                 eq(variables['isRollingBuild'], true))
 
+      # Release build of wasi wasm for CoreCLR (build-only — the
+      # runtime tests run in a separate job dispatched to Helix from
+      # wasi-wasm-coreclr-runtime-tests.yml below).
+      - template: /eng/pipelines/common/templates/wasi-wasm-coreclr-build-only.yml
+        parameters:
+          platforms:
+          - wasi_wasm
+          publishArtifactsForWorkload: true
+          condition: >-
+            or(
+              eq(variables['wasmDarcDependenciesChanged'], true),
+              eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true),
+              eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_wasm_coreclr_runtimetests.containsChange'], true),
+              eq(variables['isRollingBuild'], true))
+
+      # CoreCLR src/tests subset run on wasmtime via Helix
+      # (wasi_wasm queue -> ubuntu-26.04-helix-webassembly-amd64 image).
+      - template: /eng/pipelines/common/templates/wasi-wasm-coreclr-runtime-tests.yml
+        parameters:
+          platforms:
+          - wasi_wasm
+          alwaysRun: ${{ variables.isRollingBuild }}
+
       - template: /eng/pipelines/common/platform-matrix.yml
         parameters:
           jobTemplate: /eng/pipelines/common/global-build-job.yml

diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -30,10 +30,28 @@ if(CORECLR_SET_RPATH)
     set(MACOSX_RPATH ON)
 endif(CORECLR_SET_RPATH)
 
-if(CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_BROWSER OR CLR_CMAKE_HOST_ANDROID)
+if(CLR_CMAKE_HOST_MACCATALYST OR CLR_CMAKE_HOST_IOS OR CLR_CMAKE_HOST_TVOS OR CLR_CMAKE_HOST_BROWSER OR CLR_CMAKE_HOST_WASI OR CLR_CMAKE_HOST_ANDROID)
   set(FEATURE_STANDALONE_GC 0)
 endif()
 
+if(CLR_CMAKE_TARGET_WASI)
+  add_compile_definitions(_WASI_EMULATED_SIGNAL)
+  add_compile_definitions(_WASI_EMULATED_PROCESS_CLOCKS)
+  add_compile_definitions(_WASI_EMULATED_MMAN)
+  add_compile_definitions(_WASI_EMULATED_GETPID)
+  # EventPipe / diag-server PAL require sockets we have not validated
+  # for the WASI bring-up; revisit once corerun.wasm runs.
+  set(FEATURE_EVENT_TRACE 0)
+  set(FEATURE_PERFTRACING 0)
+  include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/pal/src/include/pal/wasi)
+  # Cross-compile try_run() answers — wasm32 binaries cannot execute on
+  # the build host, so pre-seed the cache.
+  set(REALPATH_SUPPORTS_NONEXISTENT_FILES_EXITCODE 1 CACHE STRING "" FORCE)
+  set(HAVE_WORKING_GETTIMEOFDAY_EXITCODE 0 CACHE STRING "" FORCE)
+  set(HAVE_WORKING_CLOCK_GETTIME_EXITCODE 0 CACHE STRING "" FORCE)
+  set(HAVE_PROCFS_STATM_EXITCODE 1 CACHE STRING "" FORCE)
+endif()
+
 OPTION(CLR_CMAKE_ENABLE_CODE_COVERAGE "Enable code coverage" OFF)
 
 #----------------------------------------------------
@@ -84,6 +102,11 @@ if(NOT CLR_CROSS_COMPONENTS_BUILD)
     set(STATIC_LIB_DESTINATION ${CMAKE_BINARY_DIR}/libs-native)
     set(CORERUN_LIBS_ONLY 1)
   endif()
+  if(CLR_CMAKE_TARGET_WASI)
+    # Side-build libs to avoid collision with the published libs.native artifact.
+    set(STATIC_LIB_DESTINATION ${CMAKE_BINARY_DIR}/libs-native)
+    set(CORERUN_LIBS_ONLY 1)
+  endif()
   add_subdirectory(${CLR_SRC_NATIVE_DIR}/libs libs-native)
 endif()
 
@@ -119,7 +142,7 @@ endif()
 #----------------------------------------------------
 # Build the test watchdog alongside the CLR
 #----------------------------------------------------
-if(NOT CLR_CMAKE_HOST_MACCATALYST AND NOT CLR_CMAKE_HOST_IOS AND NOT CLR_CMAKE_HOST_TVOS AND NOT CLR_CMAKE_TARGET_BROWSER)
+if(NOT CLR_CMAKE_HOST_MACCATALYST AND NOT CLR_CMAKE_HOST_IOS AND NOT CLR_CMAKE_HOST_TVOS AND NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
   add_subdirectory("${CLR_SRC_NATIVE_DIR}/watchdog" test-watchdog)
 endif()
 
@@ -149,7 +172,7 @@ endif()
 include_directories("pal/prebuilt/inc")
 include_directories(${CLR_ARTIFACTS_OBJ_DIR})
 
-if (NOT CLR_CMAKE_TARGET_BROWSER OR CLR_CROSS_COMPONENTS_BUILD)
+if ((NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI) OR CLR_CROSS_COMPONENTS_BUILD)
   add_subdirectory(tools/aot/jitinterface)
 endif ()