From 3699a7e1a90e17cfc016518fc4922b94d2dbe6be Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 11 Jan 2024 15:01:00 +1100 Subject: [PATCH] macos: Fix CMAKE_OSX_ARCHITECTURES when not set When CMAKE_OSX_ARCHITECTURES isn't set we end up with "Packaging as: mariadb-10.4.33-osx10.19-x86_64" on arm64 builders. Instead of implying 64bit is x86, use CMAKE_SYSTEM_PROCESSOR to form the filename. --- cmake/package_name.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index ce13a446fe612..ab0c1d44de858 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -99,11 +99,7 @@ IF(NOT VERSION) SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}") ENDIF() ELSE() - IF(64BIT) - SET(DEFAULT_MACHINE "x86_64") - ELSE() - SET(DEFAULT_MACHINE "i386") - ENDIF() + SET(DEFAULT_MACHINE ${CMAKE_SYSTEM_PROCESSOR}) ENDIF() IF(DEFAULT_MACHINE MATCHES "i386")