summaryrefslogtreecommitdiff
path: root/cmake/package_name.cmake
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2021-06-06 22:22:03 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2021-06-07 23:15:36 +0200
commit5ba4c4200ce1f9bce8c2fc1de5d97a131d3c2f37 (patch)
treee66b282a70dc2ae6ec3b376543dcd95dbfdf3fe4 /cmake/package_name.cmake
parent233590a48d78fb1c7e320c7131c4543c10a4face (diff)
downloadmariadb-git-5ba4c4200ce1f9bce8c2fc1de5d97a131d3c2f37.tar.gz
MDEV-25870 Windows - fix ARM64 cross-compilation
Diffstat (limited to 'cmake/package_name.cmake')
-rw-r--r--cmake/package_name.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
index d14bf1f526e..21a08401a44 100644
--- a/cmake/package_name.cmake
+++ b/cmake/package_name.cmake
@@ -38,7 +38,10 @@ IF(NOT VERSION)
SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
SET(DEFAULT_PLATFORM "win")
IF(64BIT)
- SET(DEFAULT_MACHINE "x64")
+ STRING(TOLOWER "${CMAKE_C_COMPILER_ARCHITECTURE_ID}" DEFAULT_MACHINE)
+ IF(NOT DEFAULT_MACHINE)
+ SET(DEFAULT_MACHINE "x64")
+ ENDIF()
ELSE()
SET(DEFAULT_MACHINE "32")
ENDIF()