diff --git a/packages/build-brainscales/package.py b/packages/build-brainscales/package.py index d8349c67a4d21bf29c24540e2b02f23606ee6b62..6ea4a3706b226418dc17b2b19ac81dbedada5887 100644 --- a/packages/build-brainscales/package.py +++ b/packages/build-brainscales/package.py @@ -140,10 +140,18 @@ class BuildBrainscales(WafPackage): # spack tries to find headers and libraries by itself (i.e. it's not # relying on the compiler to find it); we explicitly expose the # spack-provided env vars that contain include and library paths + if 'SPACK_STORE_INCLUDE_DIRS' in my_env: + for dir in reversed(get_path(my_env, "SPACK_STORE_INCLUDE_DIRS")): + env.prepend_path("C_INCLUDE_PATH", dir) + env.prepend_path("CPLUS_INCLUDE_PATH", dir) if 'SPACK_INCLUDE_DIRS' in my_env: for dir in reversed(get_path(my_env, "SPACK_INCLUDE_DIRS")): env.prepend_path("C_INCLUDE_PATH", dir) env.prepend_path("CPLUS_INCLUDE_PATH", dir) + if 'SPACK_STORE_LINK_DIRS' in my_env: + for dir in reversed(get_path(my_env, "SPACK_STORE_LINK_DIRS")): + env.prepend_path("LIBRARY_PATH", dir) + env.prepend_path("LD_LIBRARY_PATH", dir) if 'SPACK_LINK_DIRS' in my_env: for dir in reversed(get_path(my_env, "SPACK_LINK_DIRS")): env.prepend_path("LIBRARY_PATH", dir)