diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-07-08 21:47:38 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-08-25 08:18:10 +1000 |
| commit | ece30d47ca939944cdbb5bd2c12193c3c750fd01 (patch) | |
| tree | 8aa9740f25c9cccbe05cf287604e224dd00bfd0c | |
| parent | 1f1d5606e08c928e3da98bfeb13a7cccc307105d (diff) | |
| download | mariadb-git-ece30d47ca939944cdbb5bd2c12193c3c750fd01.tar.gz | |
MDEV-26109: s390x detected as 32bit in mtr tests
Currently @@version_compile_machine is used by mtr
to determine if the compiled executable is 32 or 64
bits.
We extend that logic by ensuring that if the DEFAUT_MACHINE
name doesn't have "64" in its string, "-64bits" is appended
to ensure these test pass.
| -rw-r--r-- | cmake/package_name.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index 8acf52f1bb3..b93641109c3 100644 --- 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() |