diff options
| author | Ethan Stam <33101855+EthanS94@users.noreply.github.com> | 2021-02-09 15:26:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 23:26:49 +0100 |
| commit | 865d38afa7e26ac1afce35d62d607a265976d8b0 (patch) | |
| tree | 2f2cb1032b0a39c9e7836baf686b925c03fe6782 /var | |
| parent | 2697c7309751e85f9c548e3cb24f20e83811ec5c (diff) | |
| download | spack-865d38afa7e26ac1afce35d62d607a265976d8b0.tar.gz spack-865d38afa7e26ac1afce35d62d607a265976d8b0.tar.bz2 spack-865d38afa7e26ac1afce35d62d607a265976d8b0.tar.xz spack-865d38afa7e26ac1afce35d62d607a265976d8b0.zip | |
ParaView, LLVM: add -shared-intel to solve intel linking failures (#18195)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/paraview/package.py | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 6e3479de89..60d1bb41a3 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -393,8 +393,14 @@ class Llvm(CMakePackage, CudaPackage): 'create this identity.' ) - def setup_build_environment(self, env): - env.append_flags("CXXFLAGS", self.compiler.cxx11_flag) + def flag_handler(self, name, flags): + if name == 'cxxflags': + flags.append(self.compiler.cxx11_flag) + return(None, flags, None) + elif name == 'ldflags' and self.spec.satisfies('%intel'): + flags.append('-shared-intel') + return(None, flags, None) + return(flags, None, None) def setup_run_environment(self, env): if "+clang" in self.spec: diff --git a/var/spack/repos/builtin/packages/paraview/package.py b/var/spack/repos/builtin/packages/paraview/package.py index f9eb40c9f4..bd763c15d1 100644 --- a/var/spack/repos/builtin/packages/paraview/package.py +++ b/var/spack/repos/builtin/packages/paraview/package.py @@ -181,6 +181,12 @@ class Paraview(CMakePackage, CudaPackage): env.set('PARAVIEW_VTK_DIR', join_path(lib_dir, 'cmake', self.paraview_subdir, 'vtk')) + def flag_handler(self, name, flags): + if name == 'ldflags' and self.spec.satisfies('%intel'): + flags.append('-shared-intel') + return(None, flags, None) + return(flags, None, None) + def setup_run_environment(self, env): # paraview 5.5 and later # - cmake under lib/cmake/paraview-5.5 |