fix: Adds Mac cross compile flags into barretenberg (#1954)

When fixing AztecProtocol/aztec-packages#1841 the flags were put in the cmake toolchains file for circuits which does not get inherited by the barretenberg toolchain files.
AztecProtocol · Sep 3, 2023 · 0e17d97 · 0e17d97
1 parent 79c29ee
commit 0e17d97
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/cpp/cmake/toolchains/aarch64-darwin.cmake b/cpp/cmake/toolchains/aarch64-darwin.cmake
@@ -1,2 +1,11 @@
 set(CMAKE_SYSTEM_NAME Darwin)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    # Clang allows us to cross compile on Mac
+    # so we explicitly specify the arch to the compiler
+    # If you just select the arch toolchain and are on an
+    # x86_64, it will compile for x86_64 mac.
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch arm64")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch arm64")
+endif()
diff --git a/cpp/cmake/toolchains/x86_64-darwin.cmake b/cpp/cmake/toolchains/x86_64-darwin.cmake
@@ -1,2 +1,11 @@
 set(CMAKE_SYSTEM_NAME Darwin)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    # Clang allows us to cross compile on Mac
+    # so we explicitly specify the arch to the compiler
+    # If you just select the x86_64 toolchain and are on an
+    # M1/arm64 mac, it will compile for arm64.
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch x86_64")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch x86_64")
+endif()