Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-17 23:24:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Unbound is now a submodule. Adapt depends for this.

Browse Source 
Fix builds for native linux and windows

The architecture flag was set incorrectly.
It needs to be set only when compiling arm6.
This commit is contained in:
TheCharlatan 2018-03-20 03:56:11 +01:00
parent d6b9bdd322
commit 5f7da005a3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -487,7 +487,7 @@ if(MSVC)
include_directories(SYSTEM src/platform/msc) include_directories(SYSTEM src/platform/msc)
else() else()
include(TestCXXAcceptsFlag) include(TestCXXAcceptsFlag)
if (NOT DEPENDS) if (NOT ARM6)
set(ARCH native CACHE STRING "CPU to build for: -march value or 'default' to not pass -march at all") 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}") message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}")

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

@ -65,8 +65,6 @@ else()
SET(CMAKE_CXX_COMPILER @CXX@) SET(CMAKE_CXX_COMPILER @CXX@)
endif() endif()
set(ARCH @arch@)
if(ARCH STREQUAL "arm") if(ARCH STREQUAL "arm")
set(ARCH "armv6zk") set(ARCH "armv6zk")
set(ARMID "armv6zk") set(ARMID "armv6zk")