diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-10-21 23:02:56 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-10-21 23:02:56 +0200 |
| commit | 39b7affcb13f9f508242e90ecd5db03b3bb3cb85 (patch) | |
| tree | e6f9359488bb2a134dd48ea1f890631303282673 /cmake | |
| parent | 7eb4bd3f1ddd9b84425d51550b44c14ac0a8f1de (diff) | |
| download | mariadb-git-39b7affcb13f9f508242e90ecd5db03b3bb3cb85.tar.gz | |
Upstream MIPS 32bit-build-on-64bit patch from Debian Bug#838914
From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838914
Fixes CMake so that when building a 32-bit mips binary on a 64-bit
mips machine, the target is not set as 32-bit, which apparently
confused some tests in mroonga.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/package_name.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/package_name.cmake b/cmake/package_name.cmake index 4ba8fc18e3f..48ca3a4814d 100644 --- a/cmake/package_name.cmake +++ b/cmake/package_name.cmake @@ -30,6 +30,10 @@ IF(NOT VERSION) SET(64BIT 1) ENDIF() + IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64") + SET(DEFAULT_MACHINE "mips") + ENDIF() + IF(CMAKE_SYSTEM_NAME MATCHES "Windows") SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0) SET(DEFAULT_PLATFORM "win") |