Merge 10.2 into 10.3

MariaDB · Aug 25, 2021 · 9f8871d · 9f8871d
2 parents 497b694 + ece30d4
commit 9f8871d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake
@@ -110,7 +110,11 @@ IF(NOT VERSION)
         SET(DEFAULT_MACHINE "x86")
       ENDIF()
     ENDIF()
-
+
+    IF(NOT DEFAULT_MACHINE MATCHES "64" AND 64BIT)
+      SET(DEFAULT_MACHINE "${DEFAULT_MACHINE}-64bit")
+    ENDIF()
+
     IF(NOT PLATFORM)
       SET(PLATFORM ${DEFAULT_PLATFORM})
     ENDIF()