summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authort-karatsu <49965247+t-karatsu@users.noreply.github.com>2020-01-09 15:04:27 +0900
committerMassimiliano Culpo <massimiliano.culpo@gmail.com>2020-01-09 07:04:27 +0100
commit592a144febc1444a07d750ee29bfb92ba60dac5b (patch)
tree04bbc4f123a88c3b04ef0e8cf8e142473a8474bc /var
parent6b3e17333153dac80beabfbd835c07b49e57c78c (diff)
downloadspack-592a144febc1444a07d750ee29bfb92ba60dac5b.tar.gz
spack-592a144febc1444a07d750ee29bfb92ba60dac5b.tar.bz2
spack-592a144febc1444a07d750ee29bfb92ba60dac5b.tar.xz
spack-592a144febc1444a07d750ee29bfb92ba60dac5b.zip
rapidjson: delete '-march' flags when using Fujitsu compiler. (#14435)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/rapidjson/package.py3
-rw-r--r--var/spack/repos/builtin/packages/rapidjson/remove_march.patch11
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/rapidjson/package.py b/var/spack/repos/builtin/packages/rapidjson/package.py
index 88f99ca2b7..12e2498a23 100644
--- a/var/spack/repos/builtin/packages/rapidjson/package.py
+++ b/var/spack/repos/builtin/packages/rapidjson/package.py
@@ -22,3 +22,6 @@ class Rapidjson(CMakePackage):
patch('0001-turn-off-Werror.patch')
patch('arm.patch', when='@1.1.0 target=aarch64: %gcc@:5.9')
+
+ # Not correspond to define '-march=native' with Fujitsu compiler.
+ patch('remove_march.patch', when='%fj')
diff --git a/var/spack/repos/builtin/packages/rapidjson/remove_march.patch b/var/spack/repos/builtin/packages/rapidjson/remove_march.patch
new file mode 100644
index 0000000000..99276fdae5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/rapidjson/remove_march.patch
@@ -0,0 +1,11 @@
+--- spack-src/CMakeLists.txt.org 2020-01-08 17:39:08.831616711 +0900
++++ spack-src/CMakeLists.txt 2020-01-08 17:39:27.431716190 +0900
+@@ -73,7 +73,7 @@
+ endif()
+ endif()
+ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Wno-missing-field-initializers")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-missing-field-initializers")
+ if (RAPIDJSON_BUILD_CXX11)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()