Skip to content
Snippets Groups Projects
Commit dd4f0bca authored by Eric Müller's avatar Eric Müller :mountain_bicyclist:
Browse files

fix(BSS2): support new spack's SPACK_STORE_{INCLUDE,LINK}_DIRS

parent bb8c9481
No related branches found
No related tags found
No related merge requests found
Pipeline #59336 waiting for manual action with stage
...@@ -140,11 +140,19 @@ class BuildBrainscales(WafPackage): ...@@ -140,11 +140,19 @@ class BuildBrainscales(WafPackage):
# spack tries to find headers and libraries by itself (i.e. it's not # 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 # relying on the compiler to find it); we explicitly expose the
# spack-provided env vars that contain include and library paths # spack-provided env vars that contain include and library paths
if 'SPACK_INCLUDE_DIRS' in my_env: 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)
elif 'SPACK_INCLUDE_DIRS' in my_env:
for dir in reversed(get_path(my_env, "SPACK_INCLUDE_DIRS")): for dir in reversed(get_path(my_env, "SPACK_INCLUDE_DIRS")):
env.prepend_path("C_INCLUDE_PATH", dir) env.prepend_path("C_INCLUDE_PATH", dir)
env.prepend_path("CPLUS_INCLUDE_PATH", dir) env.prepend_path("CPLUS_INCLUDE_PATH", dir)
if 'SPACK_LINK_DIRS' in my_env: 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)
elif 'SPACK_LINK_DIRS' in my_env:
for dir in reversed(get_path(my_env, "SPACK_LINK_DIRS")): for dir in reversed(get_path(my_env, "SPACK_LINK_DIRS")):
env.prepend_path("LIBRARY_PATH", dir) env.prepend_path("LIBRARY_PATH", dir)
env.prepend_path("LD_LIBRARY_PATH", dir) env.prepend_path("LD_LIBRARY_PATH", dir)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment