zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter_compiler_wrappers: include realpath of compiler wrappers (#24456)

Browse Source
This commit is contained in:
eugeneswalker 2021-06-22 16:37:07 -07:00 committed by GitHub
parent 4da0561496
commit 2db858e9c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/mixins.py
View File

@ -190,7 +190,11 @@ def _filter_compiler_wrappers_impl(self):
] ]
for env_var, compiler_path in replacements: for env_var, compiler_path in replacements:
if env_var in os.environ: if env_var in os.environ:
x.filter(os.environ[env_var], compiler_path, **filter_kwargs) # filter spack wrapper and links to spack wrapper in case
# build system runs realpath
wrapper = os.environ[env_var]
for wrapper_path in (wrapper, os.path.realpath(wrapper)):
x.filter(wrapper_path, compiler_path, **filter_kwargs)
# Remove this linking flag if present (it turns RPATH into RUNPATH) # Remove this linking flag if present (it turns RPATH into RUNPATH)
x.filter('{0}--enable-new-dtags'.format(self.compiler.linker_arg), '', x.filter('{0}--enable-new-dtags'.format(self.compiler.linker_arg), '',