Rework to use toolchain file

TileDB-Inc · Oct 4, 2024 · bf8d0a6 · bf8d0a6
1 parent 92ae833
commit bf8d0a6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
             manylinux: quay.io/pypa/manylinux2014_x86_64
           - platform: linux-aarch64
             os: ubuntu-24.04
-            cmake_args: -DCMAKE_SYSTEM_PROCESSOR=aarch64 -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++
+            cmake_args: -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$PWD/cmake/arm64_linux_toolchain.cmake
             triplet: arm64-linux-release
           - platform: macos-x86_64
             os: macos-12

diff --git a/cmake/arm64_linux_toolchain.cmake b/cmake/arm64_linux_toolchain.cmake
@@ -0,0 +1,11 @@
+#
+# CMake Toolchain file for crosscompiling on ARM.
+#
+# Target operating system name.
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+set(CMAKE_CROSSCOMPILING TRUE)
+
+# Name of C compiler.
+set(CMAKE_C_COMPILER "/usr/bin/aarch64-linux-gnu-gcc")
+set(CMAKE_CXX_COMPILER "/usr/bin/aarch64-linux-gnu-g++")
diff --git a/cmake/package.cmake b/cmake/package.cmake
@@ -38,12 +38,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     endif()
 else()
     set(CPACK_SYSTEM_NAME "Linux")
-    if (DEFINED CACHE{CMAKE_SYSTEM_PROCESSOR})
-      if ($CACHE{CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
-        set(CPACK_SYSTEM_PROCESSOR "arm64")
-      else()
-        set(CPACK_SYSTEM_PROCESSOR $CACHE{CMAKE_SYSTEM_PROCESSOR})
-      endif()
+    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+      set(CPACK_SYSTEM_PROCESSOR "arm64")
     else()
       set(CPACK_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
     endif()