nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup 32bit arm build

Browse Source 
Set the architecture in the toolchain file correctly
This commit is contained in:
TheCharlatan 2018-09-18 02:52:57 +02:00
parent a06d2581c3
commit 423973596b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -495,7 +495,9 @@ if(MSVC)
else() else()
include(TestCXXAcceptsFlag) include(TestCXXAcceptsFlag)
if (NOT ARM6) 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() endif()
message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}") message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}")
if(ARCH STREQUAL "default") if(ARCH STREQUAL "default")

5
contrib/depends/toolchain.cmake.in
View File

@ -31,6 +31,7 @@ SET(Boost_USE_STATIC_LIBS TRUE)
SET(Boost_USE_STATIC_RUNTIME TRUE) SET(Boost_USE_STATIC_RUNTIME TRUE)
SET(OpenSSL_DIR @prefix@/lib) SET(OpenSSL_DIR @prefix@/lib)
SET(ARCHITECTURE @arch@)
# for libraries and headers in the target directories # for libraries and headers in the target directories
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host
@ -61,7 +62,7 @@ else()
SET(CMAKE_CXX_COMPILER @CXX@) SET(CMAKE_CXX_COMPILER @CXX@)
endif() endif()
if(ARCH STREQUAL "arm") if(ARCHITECTURE STREQUAL "arm")
set(ARCH "armv7-a") set(ARCH "armv7-a")
set(ARM ON) set(ARM ON)
set(ARM_ID "armv7-a") set(ARM_ID "armv7-a")
@ -69,7 +70,7 @@ if(ARCH STREQUAL "arm")
set(CMAKE_BUILD_TYPE release) set(CMAKE_BUILD_TYPE release)
set(BUILD_TAG "linux-armv7") set(BUILD_TAG "linux-armv7")
set(ARM7) set(ARM7)
elif(ARCH STREQUAL "aarch64") elseif(ARCHITECTURE STREQUAL "aarch64")
set(ARCH "armv8-a") set(ARCH "armv8-a")
set(ARM ON) set(ARM ON)
set(ARM_ID "armv8-a") set(ARM_ID "armv8-a")