From fd7bfb1a50c274fece79a9cd6d77f03dfe6dfd05 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Mon, 19 Oct 2020 06:18:18 +0200 Subject: filter_compiler_wrappers: a fix for NAG (#17133) --- lib/spack/spack/mixins.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3-70-g09d2