fixes

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

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/librhsp/librhsp/CMakeLists.txt b/packages/librhsp/librhsp/CMakeLists.txt
@@ -43,6 +43,7 @@ set(LIB_SOURCES
         src/packet.c
 )
 
+message("Is cross compiling? ${CMAKE_CROSSCOMPILING}")
 if(CMAKE_CROSSCOMPILING)
     if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
         if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")

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, "--CDCMAKE_SYSTEM_PROCESSOR=x86_64", "--CDSYSTEM=DarwinX64"], baseBuildPath + "js-darwinX64");
+await runCmakeJs([...cmakeJsArgs, "--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"))