aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-01-12 14:44:46 +0200
committerRiccardo Spagni <ric@spagni.net>2016-01-12 14:44:46 +0200
commit92b753d5e4e2d58e549869a48799396565c616d7 (patch)
treed729c8bf69b28b1ec3e1fb4c87d1e01289b611b7 /CMakeLists.txt
parentMerge pull request #605 (diff)
parentFix arm asm (diff)
downloadmonero-92b753d5e4e2d58e549869a48799396565c616d7.tar.xz
Merge pull request #606
8ce12a9 Fix arm asm (Howard Chu) 94de39f Tweak arm6 flags (Howard Chu)
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae2a19c01..64b9f3e62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -284,7 +284,7 @@ if(MSVC)
else()
set(ARCH native CACHE STRING "CPU to build for: -march value or default")
# -march=armv7-a conflicts with -mcpu=cortex-a7
- if(ARCH STREQUAL "default" OR ARM7)
+ if(ARCH STREQUAL "default" OR ARM7 OR ARM6)
set(ARCH_FLAG "")
else()
if(ARCH STREQUAL "x86_64")