Skip to content

Commit ac0269a

Browse files
author
jK
committed
fix "INFO-march=i686 flag not accepted"
1 parent 760ee28 commit ac0269a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
195195
set (MARCH_FLAG CACHE STRING "CPU optimization (use i686 for generic optimization)")
196196
else (CMAKE_SIZEOF_VOID_P EQUAL 8)
197197
message (STATUS "Building Spring for 32bit environment")
198-
set (MARCH_FLAG ${I686_FLAG} CACHE STRING "CPU optimization (use i686 for generic optimization)")
198+
set (MARCH_FLAG ${MARCH} CACHE STRING "CPU optimization (use i686 for generic optimization)")
199199
endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
200200

201201
if ($ENV{CXX} MATCHES "icpc")

rts/build/cmake/TestCXXFlags.cmake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ If (NOT DEFINED VISIBILITY_HIDDEN)
2626
EndIf (HAS_VISIBILITY_HIDDEN)
2727
EndIf (NOT MINGW AND NOT APPLE)
2828
EndIf (NOT DEFINED VISIBILITY_HIDDEN)
29-
29+
3030

3131
If (NOT DEFINED VISIBILITY_INLINES_HIDDEN)
3232
Set(VISIBILITY_INLINES_HIDDEN "")
@@ -87,13 +87,13 @@ If (NOT DEFINED LTO_FLAGS)
8787
EndIf (LTO AND LTO_WHOPR)
8888
EndIf (NOT DEFINED LTO_FLAGS)
8989

90-
IF (NOT DEFINED I686_FLAG)
91-
CHECK_CXX_ACCEPTS_FLAG("-march i686" HAS_I686_FLAG)
92-
IF (HAS_I686_FLAG)
93-
Set(HAS_I686_FLAG "-march i686")
94-
Else (HAS_I686_FLAG)
95-
Message(INFO "-march i686 flag not accepted")
96-
Set(I686_FLAG "")
97-
EndIf (HAS_I686_FLAG)
98-
EndIf (NOT DEFINED I686_FLAG)
9990

91+
IF (NOT DEFINED MARCH)
92+
CHECK_CXX_ACCEPTS_FLAG("-march=i686" HAS_I686_FLAG_)
93+
IF (HAS_I686_FLAG_)
94+
Set(MARCH "i686")
95+
Else (HAS_I686_FLAG_)
96+
Message(INFO "-march=i686 flag not accepted")
97+
Set(MARCH "")
98+
EndIf (HAS_I686_FLAG_)
99+
EndIf (NOT DEFINED MARCH)

0 commit comments

Comments
 (0)