build, refactor: update iPhone simulator targets and improve CMake co…

…nditions.
fibjs · Nov 15, 2024 · 846544a · 846544a
1 parent 853567e
commit 846544a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -145,7 +145,12 @@ jobs:
             type: release
             test: skip
           - os: macos-14
-            target: iphone
+            target: iphone-simulator
+            arch: arm64
+            type: release
+            test: skip
+          - os: macos-14
+            target: iphone-simulator
             arch: x64
             type: release
             test: skip

diff --git a/build_tools b/build_tools
diff --git a/openssl/CMakeLists.txt b/openssl/CMakeLists.txt
@@ -7,7 +7,7 @@ if("${BUILD_OS}" STREQUAL "Windows")
 else()
     enable_language(ASM)
 
-    if("${BUILD_OS}" STREQUAL "Darwin" OR "${BUILD_OS}" STREQUAL "iPhone")
+    if("${BUILD_OS}" MATCHES "Darwin|iPhone")
         include(./cmake/darwin_${BUILD_ARCH}.cmake)
     elseif("${BUILD_ARCH}" STREQUAL "loong64ow")
         include(./cmake/linux_loong64.cmake)

diff --git a/v8/CMakeLists.txt b/v8/CMakeLists.txt
@@ -19,6 +19,8 @@ if("${BUILD_OS}" STREQUAL "Alpine")
 	include(cmake/v8-${BUILD_ARCH}-Linux.cmake)
 elseif("${BUILD_ARCH}" STREQUAL "loong64ow")
 	include(cmake/v8-loong64-${BUILD_OS}.cmake)
+elseif("${BUILD_OS}" MATCHES "iPhone")
+	include(cmake/v8-${BUILD_ARCH}-iPhone.cmake)
 else()
 	include(cmake/v8-${BUILD_ARCH}-${BUILD_OS}.cmake)
 endif()

diff --git a/v8/cmake/options.cmake b/v8/cmake/options.cmake
@@ -41,7 +41,7 @@ if("${BUILD_ARCH}" STREQUAL "x64")
 	add_definitions(-DV8_ENABLE_WASM_SIMD256_REVEC)
 endif()
 
-if("${BUILD_OS}" STREQUAL "iPhone")
+if("${BUILD_OS}" MATCHES "iPhone")
 	add_definitions(-DV8_JITLESS)
 endif()
+2 −0		cmake-scripts/get_env.cmake
+20 −10		cmake/option_flags_clang.cmake
+1 −1		cmake/option_src.cmake
+2 −0		scripts/actions-env.sh
+2 −2		scripts/build