diff options
| author | Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> | 2020-10-19 06:18:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-18 23:18:18 -0500 |
| commit | fd7bfb1a50c274fece79a9cd6d77f03dfe6dfd05 (patch) | |
| tree | d7405c5257711707cee2267d18461bd6ecb63e7b /lib | |
| parent | 4750d479a09ceeb1e5f575337f7e851ec688b1e1 (diff) | |
| download | spack-fd7bfb1a50c274fece79a9cd6d77f03dfe6dfd05.tar.gz spack-fd7bfb1a50c274fece79a9cd6d77f03dfe6dfd05.tar.bz2 spack-fd7bfb1a50c274fece79a9cd6d77f03dfe6dfd05.tar.xz spack-fd7bfb1a50c274fece79a9cd6d77f03dfe6dfd05.zip | |
filter_compiler_wrappers: a fix for NAG (#17133)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/mixins.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py index f7162a3a84..6da12e4dce 100644 --- a/lib/spack/spack/mixins.py +++ b/lib/spack/spack/mixins.py @@ -187,7 +187,13 @@ def filter_compiler_wrappers(*files, **kwargs): x.filter(os.environ[env_var], compiler_path, **filter_kwargs) # Remove this linking flag if present (it turns RPATH into RUNPATH) - x.filter('-Wl,--enable-new-dtags', '', **filter_kwargs) + x.filter('{0}--enable-new-dtags'.format(self.compiler.linker_arg), '', + **filter_kwargs) + + # NAG compiler is usually mixed with GCC, which has a different + # prefix for linker arguments. + if self.compiler.name == 'nag': + x.filter('-Wl,--enable-new-dtags', '', **filter_kwargs) PackageMixinsMeta.register_method_after( _filter_compiler_wrappers_impl, after |