diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-09-25 15:45:55 -0400 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-09-25 15:45:56 -0400 |
| commit | 1b23c05299da72a0e7c3c7981887f9f5e55e2fac (patch) | |
| tree | 147b732415efa2cdf66c39aa1d3d4813d53b7519 /contrib | |
| parent | Merge pull request #5929 (diff) | |
| parent | Don't set ARCH_ID if it's already set (diff) | |
| download | monero-1b23c05299da72a0e7c3c7981887f9f5e55e2fac.tar.xz | |
Merge pull request #5930
fcfa6665 Don't set ARCH_ID if it's already set (Howard Chu)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 3be748ae7..ebe96b69c 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -104,12 +104,14 @@ if(ARCHITECTURE STREQUAL "riscv64") set(ARCH "rv64imafdc") endif() -if(ARCHITECTURE STREQUAL "i686" AND CMAKE_SYSTEM_NAME STREQUAL "Linux") - SET(LINUX_32 ON) +if(ARCHITECTURE STREQUAL "i686") SET(ARCH_ID "i386") + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + SET(LINUX_32 ON) + endif() endif() -if(ARCHITECTURE STREQUAL "x86_64" AND CMAKE_SYSTEM_NAME STREQUAL "Linux") +if(ARCHITECTURE STREQUAL "x86_64") SET(ARCH_ID "x86_64") endif() |