1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge 10.5 into 10.6

This commit is contained in:
Marko Mäkelä
2021-08-25 08:15:20 +03:00
5 changed files with 11 additions and 9 deletions

View File

@@ -113,7 +113,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()