diff options
| author | TheCharlatan <seb.kung@gmail.com> | 2018-03-20 03:56:11 +0100 |
|---|---|---|
| committer | TheCharlatan <seb.kung@gmail.com> | 2018-09-10 22:05:37 +0200 |
| commit | 5f7da005a3897184e9395c054da2ad8bed3e56bb (patch) | |
| tree | 36fafc7f37b3f0fab70cffeec87d1e3dc844dbdf | |
| parent | Update readmes to reflect the usage of depends (diff) | |
| download | monero-5f7da005a3897184e9395c054da2ad8bed3e56bb.tar.xz | |
Unbound is now a submodule. Adapt depends for this.
Fix builds for native linux and windows
The architecture flag was set incorrectly.
It needs to be set only when compiling arm6.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b1fea6899..771b34949 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -487,7 +487,7 @@ if(MSVC) include_directories(SYSTEM src/platform/msc) else() 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") endif() message(STATUS "Building on ${CMAKE_SYSTEM_PROCESSOR} for ${ARCH}") diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 06217363c..f76d7d1ea 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -65,8 +65,6 @@ else() SET(CMAKE_CXX_COMPILER @CXX@) endif() -set(ARCH @arch@) - if(ARCH STREQUAL "arm") set(ARCH "armv6zk") set(ARMID "armv6zk") |