From 55ac6fb542f037e8c717bf737fbf5f74d8b79eb7 Mon Sep 17 00:00:00 2001 From: Gregory Becker Date: Thu, 23 Mar 2023 14:04:05 -0700 Subject: [PATCH] prepend compiler bindir to PATH lower priority than wrapper --- lib/spack/spack/build_environment.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 14195f7c25b..afb5621d688 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -423,6 +423,14 @@ def set_wrapper_variables(pkg, env): compiler = pkg.compiler 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: extra_rpaths = ":".join(compiler.extra_rpaths) env.set("SPACK_COMPILER_EXTRA_RPATHS", extra_rpaths)