Commit 3699a7e1 authored by Daniel Black's avatar Daniel Black

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.
parent 7c2f0822
...@@ -99,11 +99,7 @@ IF(NOT VERSION) ...@@ -99,11 +99,7 @@ IF(NOT VERSION)
SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}") SET(DEFAULT_MACHINE "${CMAKE_OSX_ARCHITECTURES}")
ENDIF() ENDIF()
ELSE() ELSE()
IF(64BIT) SET(DEFAULT_MACHINE ${CMAKE_SYSTEM_PROCESSOR})
SET(DEFAULT_MACHINE "x86_64")
ELSE()
SET(DEFAULT_MACHINE "i386")
ENDIF()
ENDIF() ENDIF()
IF(DEFAULT_MACHINE MATCHES "i386") IF(DEFAULT_MACHINE MATCHES "i386")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment