aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredfish <redfish@galactica.pw>2016-08-28 01:42:59 -0400
committerredfish <redfish@galactica.pw>2016-08-28 02:10:36 -0400
commitc2bc34b7366e9f5dcb62603bf3ac79b88357c2b0 (patch)
treed7e5dafd5378bfdbf4c1c7b0236b399d3bb0dba7
parentcmake: don't set ARCH from CMAKE_SYSTEM_PROCESSOR (diff)
downloadmonero-c2bc34b7366e9f5dcb62603bf3ac79b88357c2b0.tar.xz
Revert "Interpret x86_64 as x86-64 for architecture"
This reverts commit 86234921506944dddab4e2f5edf96bf747be6c73. Let's restrict ARCH to values accepted by -march to keep things clear and consistent. ARCH is -march, with only one exception: a value of "default" indicates to not pass -march at all.
-rw-r--r--CMakeLists.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc546c007..ed5fc142d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,11 +312,7 @@ else()
if(ARCH STREQUAL "default")
set(ARCH_FLAG "")
else()
- if(ARCH STREQUAL "x86_64")
- set(ARCH_FLAG "-march=x86-64")
- else()
- set(ARCH_FLAG "-march=${ARCH}")
- endif()
+ set(ARCH_FLAG "-march=${ARCH}")
endif()
set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-variable -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
if(NOT MINGW)