Merge pull request #87 from ye-luo/fix-GNU-ppc64

Avoid GNU/Clang adding -march on PowerPC.
QMCPACK · Jan 17, 2018 · b3b8ef7 · b3b8ef7
2 parents 97a8ded + d57b4bb
commit b3b8ef7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/CMake/ClangCompilers.cmake b/CMake/ClangCompilers.cmake
@@ -34,10 +34,10 @@ SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffast-math" )
 SET( CMAKE_C_FLAGS_RELWITHDEBINFO     "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math" )
 SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ffast-math" )
 
-#------------------------
-# Not on Cray's machine
-#------------------------
-IF(NOT $ENV{CRAYPE_VERSION} MATCHES ".")
+#--------------------------------------
+# Neither on Cray's machine nor PowerPC
+#--------------------------------------
+IF((NOT $ENV{CRAYPE_VERSION} MATCHES ".") AND (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64"))
 
 #check if the user has already specified -march=XXXX option for cross-compiling.
 if(CMAKE_CXX_FLAGS MATCHES "-march=" OR CMAKE_C_FLAGS MATCHES "-march=")
@@ -52,7 +52,7 @@ else() #(CMAKE_CXX_FLAGS MATCHES "-march=" OR CMAKE_C_FLAGS MATCHES "-march=")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
 endif() #(CMAKE_CXX_FLAGS MATCHES "-march=" OR CMAKE_C_FLAGS MATCHES "-march=")
 
-ENDIF(NOT $ENV{CRAYPE_VERSION} MATCHES ".")
+ENDIF((NOT $ENV{CRAYPE_VERSION} MATCHES ".") AND (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64"))
 
 # Add static flags if necessary
 IF(QMC_BUILD_STATIC)

diff --git a/CMake/GNUCompilers.cmake b/CMake/GNUCompilers.cmake
@@ -27,10 +27,10 @@ SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffast-math" )
 SET( CMAKE_C_FLAGS_RELWITHDEBINFO     "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math" )
 SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ffast-math" )
 
-#------------------------
-# Not on Cray's machine
-#------------------------
-IF(NOT $ENV{CRAYPE_VERSION} MATCHES ".")
+#--------------------------------------
+# Neither on Cray's machine nor PowerPC
+#--------------------------------------
+IF((NOT $ENV{CRAYPE_VERSION} MATCHES ".") AND (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64"))
 
 #check if the user has already specified -march=XXXX option for cross-compiling.
 if(CMAKE_CXX_FLAGS MATCHES "-march=" OR CMAKE_C_FLAGS MATCHES "-march=")
@@ -45,7 +45,7 @@ else() #(CMAKE_CXX_FLAGS MATCHES "-march=" OR CMAKE_C_FLAGS MATCHES "-march=")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
 endif() #(CMAKE_CXX_FLAGS MATCHES "-march=" OR CMAKE_C_FLAGS MATCHES "-march=")
 
-ENDIF(NOT $ENV{CRAYPE_VERSION} MATCHES ".")
+ENDIF((NOT $ENV{CRAYPE_VERSION} MATCHES ".") AND (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64"))
 
 # Add static flags if necessary
 IF(QMC_BUILD_STATIC)