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

prepend compiler bindir to PATH lower priority than wrapper

Browse Source
This commit is contained in:
Gregory Becker 2023-03-23 14:04:05 -07:00
parent 68874a72fb
commit 55ac6fb542
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/build_environment.py
View File

@ -423,6 +423,14 @@ def set_wrapper_variables(pkg, env):
compiler = pkg.compiler compiler = pkg.compiler
env.extend(spack.schema.environment.parse(compiler.environment)) env.extend(spack.schema.environment.parse(compiler.environment))
# Before setting up PATH to Spack compiler wrappers, make sure compiler is in PATH
# This ensures that non-wrapped executables from the compiler bin directory are available
bindirs = dedupe(
[os.path.dirname(c) for c in [compiler.cc, compiler.cxx, compiler.fc, compiler.f77]]
)
for bindir in bindirs:
env.prepend_path("PATH", bindir)
if compiler.extra_rpaths: if compiler.extra_rpaths:
extra_rpaths = ":".join(compiler.extra_rpaths) extra_rpaths = ":".join(compiler.extra_rpaths)
env.set("SPACK_COMPILER_EXTRA_RPATHS", extra_rpaths) env.set("SPACK_COMPILER_EXTRA_RPATHS", extra_rpaths)