diff options
| author | TheCharlatan <seb.kung@gmail.com> | 2018-09-18 02:52:57 +0200 |
|---|---|---|
| committer | TheCharlatan <seb.kung@gmail.com> | 2018-09-18 02:52:57 +0200 |
| commit | 423973596ba6ce645bc578bbc4774023caa335c6 (patch) | |
| tree | e3d588422e1219dbc8dfc1de6ae8ae2119dbd80b | |
| parent | Fix Windows build (diff) | |
| download | monero-423973596ba6ce645bc578bbc4774023caa335c6.tar.xz | |
Fixup 32bit arm build
Set the architecture in the toolchain file correctly
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0de82b436..e62179e18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -495,7 +495,9 @@ if(MSVC) else() include(TestCXXAcceptsFlag) if (NOT ARM6) - set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all") + if(NOT DEPENDS OR DEPENDS AND NOT ARM) + set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all") + endif() endif() message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}") if(ARCH STREQUAL "default") diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index d2fdd4270..b594ddd62 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -31,6 +31,7 @@ SET(Boost_USE_STATIC_LIBS TRUE) SET(Boost_USE_STATIC_RUNTIME TRUE) SET(OpenSSL_DIR @prefix@/lib) +SET(ARCHITECTURE @arch@) # for libraries and headers in the target directories set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host @@ -61,7 +62,7 @@ else() SET(CMAKE_CXX_COMPILER @CXX@) endif() -if(ARCH STREQUAL "arm") +if(ARCHITECTURE STREQUAL "arm") set(ARCH "armv7-a") set(ARM ON) set(ARM_ID "armv7-a") @@ -69,7 +70,7 @@ if(ARCH STREQUAL "arm") set(CMAKE_BUILD_TYPE release) set(BUILD_TAG "linux-armv7") set(ARM7) -elif(ARCH STREQUAL "aarch64") +elseif(ARCHITECTURE STREQUAL "aarch64") set(ARCH "armv8-a") set(ARM ON) set(ARM_ID "armv8-a") |