[podspec] Build for macOS arm64

facebook · Sep 14, 2020 · 4beb619 · 4beb619
1 parent c5418d4
commit 4beb619
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -202,7 +202,7 @@ jobs:
 
   macos:
     macos:
-      xcode: "10.0.0"
+      xcode: "12.0.0"
     environment:
       - HERMES_WS_DIR: /tmp/hermes
       - TERM: dumb
@@ -224,12 +224,12 @@ jobs:
           name: Build LLVM
           command: |
             cd "$HERMES_WS_DIR"
-            hermes/utils/build/build_llvm.py --distribute llvm llvm_build
+            hermes/utils/build/build_llvm.py --distribute --cmake-flags='-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.13 -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64;arm64' llvm llvm_build
       - run:
           name: Build Hermes for macOS
           command: |
             cd "$HERMES_WS_DIR"
-            hermes/utils/build/configure.py --distribute --cmake-flags='-DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=false'
+            hermes/utils/build/configure.py --distribute --cmake-flags='-DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=false -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.13 -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64;arm64'
             cmake --build ./build_release --target github-cli-release
       - run:
           name: Copy artifacts
@@ -253,7 +253,7 @@ jobs:
 
   build-macos-runtime:
     macos:
-      xcode: "10.3.0"
+      xcode: "12.0.0"
     environment:
       - HERMES_WS_DIR: /tmp/hermes
       - TERM: dumb

diff --git a/hermes.podspec b/hermes.podspec
@@ -12,11 +12,11 @@ module HermesHelper
   end
 
   def self.llvm_configure_command
-    "./utils/build/build_llvm.py #{"--distribute" if BUILD_TYPE == :release}"
+    "./utils/build/build_llvm.py #{"--distribute" if BUILD_TYPE == :release} --cmake-flags='-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.13 -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64;arm64'"
   end
 
   def self.cmake_configuration
-    "-DHERMES_ENABLE_DEBUGGER:BOOLEAN=true -DHERMES_ENABLE_TEST_SUITE:BOOLEAN=false -DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=true -DHERMES_BUILD_APPLE_DSYM:BOOLEAN=true"
+    "-DHERMES_ENABLE_DEBUGGER:BOOLEAN=true -DHERMES_ENABLE_TEST_SUITE:BOOLEAN=false -DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=true -DHERMES_BUILD_APPLE_DSYM:BOOLEAN=true -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.13 -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64;arm64"
   end
 
   def self.configure_command