From ef5da08f80bec4be4d62e1d16165a9b19ec0ebdf Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Mon, 1 May 2017 22:58:24 +0200 Subject: only add direct build-only dependencies to PATH --- lib/spack/spack/build_environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index 2ac935291d..c3f887fd69 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -248,7 +248,7 @@ def set_build_environment_variables(pkg, env, dirty=False): dirty (bool): Skip unsetting the user's environment settings """ # Gather information about various types of dependencies - build_deps = pkg.spec.traverse(root=False, deptype=('build')) + build_deps = pkg.spec.dependencies(deptype='build') link_deps = pkg.spec.traverse(root=False, deptype=('link')) build_link_deps = pkg.spec.traverse(root=False, deptype=('build', 'link')) rpath_deps = get_rpath_deps(pkg) -- cgit v1.2.3-70-g09d2 From 708d8586eab7c8a1960a7a30269a0c43317746af Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 2 May 2017 08:43:37 +0200 Subject: add run-time dependencies of direct build-time dependencies to PATH --- lib/spack/spack/build_environment.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py index c3f887fd69..ac1eaaa77a 100644 --- a/lib/spack/spack/build_environment.py +++ b/lib/spack/spack/build_environment.py @@ -258,6 +258,11 @@ def set_build_environment_variables(pkg, env, dirty=False): build_link_prefixes = [dep.prefix for dep in build_link_deps] rpath_prefixes = [dep.prefix for dep in rpath_deps] + # add run-time dependencies of direct build-time dependencies: + for bd in build_deps: + for rd in bd.dependencies(deptype='run'): + build_prefixes.append(rd.prefix) + # Filter out system paths: ['/', '/usr', '/usr/local'] # These paths can be introduced into the build when an external package # is added as a dependency. The problem with these paths is that they often -- cgit v1.2.3-70-g09d2