From 0fd71d24ba8e402ac2ac6cf97e6f52b47e77a73d Mon Sep 17 00:00:00 2001 From: "Tomoki, Karatsu" <49965247+t-karatsu@users.noreply.github.com> Date: Wed, 1 Jul 2020 01:02:18 +0900 Subject: cleverleaf: Add C++ link flags for Fujitsu. (#17308) --- .../builtin/packages/cleverleaf/fujitsu_add_link_flags.patch | 10 ++++++++++ var/spack/repos/builtin/packages/cleverleaf/package.py | 4 ++++ 2 files changed, 14 insertions(+) create mode 100644 var/spack/repos/builtin/packages/cleverleaf/fujitsu_add_link_flags.patch diff --git a/var/spack/repos/builtin/packages/cleverleaf/fujitsu_add_link_flags.patch b/var/spack/repos/builtin/packages/cleverleaf/fujitsu_add_link_flags.patch new file mode 100644 index 0000000000..f3146f7a48 --- /dev/null +++ b/var/spack/repos/builtin/packages/cleverleaf/fujitsu_add_link_flags.patch @@ -0,0 +1,10 @@ +--- spack-src/CMakeLists.txt.org 2020-06-29 14:38:00.737544597 +0900 ++++ spack-src/CMakeLists.txt 2020-06-29 14:40:33.758297327 +0900 +@@ -24,6 +24,6 @@ + + add_definitions(-DVERSION="git" -DHOST_NAME="cab") + +-set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "") ++set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "--linkfortran") + + add_subdirectory (src) diff --git a/var/spack/repos/builtin/packages/cleverleaf/package.py b/var/spack/repos/builtin/packages/cleverleaf/package.py index afb4b25ce2..2b8163f5a6 100644 --- a/var/spack/repos/builtin/packages/cleverleaf/package.py +++ b/var/spack/repos/builtin/packages/cleverleaf/package.py @@ -24,6 +24,10 @@ class Cleverleaf(CMakePackage): depends_on('boost') depends_on('cmake@3.1:', type='build') + # The Fujitsu compiler requires the '--linkfortran' + # option to combine C++ and Fortran programs. + patch('fujitsu_add_link_flags.patch', when='%fj') + def flag_handler(self, name, flags): if self.spec.satisfies('%intel') and name in ['cppflags', 'cxxflags']: flags.append(self.compiler.cxx11_flag) -- cgit v1.2.3-60-g2f50