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

fix(bazel): build on ju{suf,reca}

parent 87a7075b
No related branches found
No related tags found
1 merge request!504fix(bazel): build on ju{suf,reca}
Pipeline #28286 failed with stage
in 4 minutes and 26 seconds
...@@ -439,7 +439,9 @@ class Bazel(Package): ...@@ -439,7 +439,9 @@ class Bazel(Package):
patch("cc_configure-0.3.0.patch", when="@0.3:0.4") patch("cc_configure-0.3.0.patch", when="@0.3:0.4")
# Set CC and CXX # Set CC and CXX
patch("compile-0.29.patch", when="@0.29:") # begin EBRAINS: modified, bring upstream after checking since when this is breaking the build
patch("compile-0.29.patch", when="@0.29:5.3")
# end EBRAINS
patch("compile-0.21.patch", when="@0.21:0.28") patch("compile-0.21.patch", when="@0.21:0.28")
patch("compile-0.16.patch", when="@0.16:0.20") patch("compile-0.16.patch", when="@0.16:0.20")
patch("compile-0.13.patch", when="@0.13:0.15") patch("compile-0.13.patch", when="@0.13:0.15")
...@@ -527,8 +529,11 @@ class Bazel(Package): ...@@ -527,8 +529,11 @@ class Bazel(Package):
"--color=no --host_javabase=@local_jdk//:jdk" "--color=no --host_javabase=@local_jdk//:jdk"
# Enable verbose output for failures # Enable verbose output for failures
" --verbose_failures" " --verbose_failures"
# expose LD_LIBRARY_PATH (to fix protoc runtime error during build) # begin EBRAINS: modified, bring upstream after checking since when the compile-x.patch is breaking the build
" --action_env=LD_LIBRARY_PATH" # expose CC and CXX (the spack compiler wrappers)
" --action_env=CC"
" --action_env=CXX"
# end EBRAINS
" --jobs={0}".format(make_jobs), " --jobs={0}".format(make_jobs),
) )
......
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