Skip to content

Commit

Permalink
macos: Fix CMAKE_OSX_ARCHITECTURES when not set
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
grooverdan committed Jan 23, 2024
1 parent 7c2f082 commit 3699a7e
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions cmake/package_name.cmake
Expand Up @@ -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")
Expand Down

0 comments on commit 3699a7e

Please sign in to comment.