cr suggestions

bytecodealliance · Oct 15, 2024 · 341e1d1 · 341e1d1
1 parent 361f973
commit 341e1d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/build-scripts/config_common.cmake b/build-scripts/config_common.cmake
@@ -88,7 +88,10 @@ endif ()
 endif ()
 
 if (WAMR_BUILD_FAST_JIT EQUAL 1)
-  if (NOT WAMR_BUILD_LAZY_JIT EQUAL 0)
+  if (WAMR_BUILD_PLATFORM STREQUAL "windows")
+    message ("Fast JIT currently not supported on Windows")
+    set (WAMR_BUILD_FAST_JIT 0)
+  elseif (NOT WAMR_BUILD_LAZY_JIT EQUAL 0)
     # Enable Lazy JIT by default
     set (WAMR_BUILD_LAZY_JIT 1)
   endif ()
@@ -274,7 +277,12 @@ if (WAMR_BUILD_LIB_PTHREAD EQUAL 1)
   message ("     Lib pthread enabled")
 endif ()
 if (WAMR_BUILD_LIB_PTHREAD_SEMAPHORE EQUAL 1)
-  message ("     Lib pthread semaphore enabled")
+  if (WAMR_BUILD_PLATFORM STREQUAL "windows")
+    set (WAMR_BUILD_LIB_PTHREAD_SEMAPHORE 0)
+    message ("     Lib pthread semaphore currently not supported on Windows")
+  else ()
+    message ("     Lib pthread semaphore enabled")
+  endif ()
 endif ()
 if (WAMR_BUILD_LIB_WASI_THREADS EQUAL 1)
   message ("     Lib wasi-threads enabled")

diff --git a/product-mini/platforms/windows/CMakeLists.txt b/product-mini/platforms/windows/CMakeLists.txt
@@ -47,11 +47,6 @@ if (NOT DEFINED WAMR_BUILD_JIT)
   set (WAMR_BUILD_JIT 0)
 endif ()
 
-# Disable Fast JIT on Windows for now
-set (WAMR_BUILD_FAST_JIT 0)
-# Disable Pthreads semaphore on Windows
-set (WAMR_BUILD_LIB_PTHREAD_SEMAPHORE 0)
-
 if (NOT DEFINED WAMR_BUILD_LIBC_BUILTIN)
   # Enable libc builtin support by default
   set (WAMR_BUILD_LIBC_BUILTIN 1)