zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rapidjson: Don't add -march=native on ARM and gcc 5.x or before. (#12117)

Browse Source
This commit is contained in:
Toyohisa Kameyama 2019-07-25 02:30:32 +09:00 committed by Adam J. Stewart
parent 63813fa9c0
commit cb62b1ff85
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/rapidjson/arm.patch Executable file
View File

@ -0,0 +1,15 @@
diff -ru spack-src/CMakeLists.txt spack-src.new/CMakeLists.txt
--- spack-src/CMakeLists.txt 2019-07-24 15:44:41.200676445 +0900
+++ spack-src.new/CMakeLists.txt 2019-07-24 15:43:52.140673234 +0900
@@ -50,7 +50,10 @@
endif(CCACHE_FOUND)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+ if(NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+ endif()
if (RAPIDJSON_BUILD_CXX11)
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")

2
var/spack/repos/builtin/packages/rapidjson/package.py
View File

@ -20,3 +20,5 @@ class Rapidjson(CMakePackage):
# released versions compile with -Werror and fail with gcc-7
# branch-fall-through warnings
patch('0001-turn-off-Werror.patch')
patch('arm.patch', when='@1.1.0 target=aarch64 %gcc@:5.9')