specify architecture for mac

REVrobotics · Aug 18, 2023 · 4870375 · 4870375
1 parent 5bc78fd
commit 4870375
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/librhsp/librhsp/CMakeLists.txt b/packages/librhsp/librhsp/CMakeLists.txt
@@ -74,8 +74,10 @@ if(CMAKE_CROSSCOMPILING)
             src/arch/mac/serial.c
         )
         if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+            set(CMAKE_OSX_ARCHITECTURES "x86_64")
             add_compile_options("-target" "x86_64-pc-linux-gnu")
         elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
+            set(CMAKE_OSX_ARCHITECTURES "arm64")
             add_compile_options("-target" "aarch64-pc-linux-gnu")
         else()
             message(FATAL_ERROR "Unsupported architecture for Darwin cross-compilation:'${CMAKE_SYSTEM_PROCESSOR}'")

diff --git a/packages/librhsp/scripts/macos-cross-build.mjs b/packages/librhsp/scripts/macos-cross-build.mjs
@@ -42,8 +42,8 @@ fs.mkdirSync(path.join(prebuiltsFolder, "darwin-arm64"), { recursive: true })
 let cmakeJsArgs = [ "compile", "--config", "Release", "--CDCMAKE_SYSTEM_NAME=Darwin", "--prefer-clang=true" ]
 
 console.log("Prebuildifying")
-await runCmakeJs([...cmakeJsArgs, "--CDCMAKE_SYSTEM_PROCESSOR=x86_64", "--CDSYSTEM=DarwinX64"], baseBuildPath + "js-darwinX64");
-await runCmakeJs([...cmakeJsArgs, "--CDCMAKE_SYSTEM_PROCESSOR=arm64", "--CDSYSTEM=DarwinArm64"], baseBuildPath + "js-darwinArm64");
+await runCmakeJs([...cmakeJsArgs, "--arch=x86_64", "--CDCMAKE_SYSTEM_PROCESSOR=x86_64", "--CDSYSTEM=DarwinX64"], baseBuildPath + "js-darwinX64");
+await runCmakeJs([...cmakeJsArgs, "--arch=arm64", "--CDCMAKE_SYSTEM_PROCESSOR=arm64", "--CDSYSTEM=DarwinArm64"], baseBuildPath + "js-darwinArm64");
 
 fs.copyFileSync(baseBuildPath + "js-darwinX64/rhsp.node", path.join(prebuiltsFolder, "darwin-x64/rhsp.node"))
 fs.copyFileSync(baseBuildPath + "js-darwinArm64/rhsp.node", path.join(prebuiltsFolder, "darwin-arm64/rhsp.node"))