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

fix libtool filter for Fujitsu compilers (#34916)

Browse Source 
Since legit regular expressions are matched, do not pass string=True
to the filter

Refs #34897
This commit is contained in:
Gilles Gouaillardet 2023-01-16 23:56:13 +09:00 committed by GitHub
parent 904eefc930
commit 17a67b9a56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/spack/spack/build_systems/autotools.py
View File

@ -427,15 +427,15 @@ def _do_patch_libtool(self):
x.filter(regex="-nostdlib", repl="", string=True) x.filter(regex="-nostdlib", repl="", string=True)
rehead = r"/\S*/" rehead = r"/\S*/"
for o in [ for o in [
"fjhpctag.o", r"fjhpctag\.o",
"fjcrt0.o", r"fjcrt0\.o",
"fjlang08.o", r"fjlang08\.o",
"fjomp.o", r"fjomp\.o",
"crti.o", r"crti\.o",
"crtbeginS.o", r"crtbeginS\.o",
"crtendS.o", r"crtendS\.o",
]: ]:
x.filter(regex=(rehead + o), repl="", string=True) x.filter(regex=(rehead + o), repl="")
elif self.pkg.compiler.name == "dpcpp": elif self.pkg.compiler.name == "dpcpp":
# Hack to filter out spurious predep_objects when building with Intel dpcpp # Hack to filter out spurious predep_objects when building with Intel dpcpp
# (see https://github.com/spack/spack/issues/32863): # (see https://github.com/spack/spack/issues/32863):