Add latest version of bazel (#13813)
* use bazel commit in #13112, and add version 0.24.1, and corresponding cc_env patch * undo preferred java version by dodo47 * patch for v0.26 * Update install steps * Add patches for more versions * Add unit tests * Update patches for new Spack env vars * env is already defined, use spackEnv
This commit is contained in:
@@ -0,0 +1,16 @@
|
||||
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
|
||||
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
|
||||
@@ -168,6 +168,13 @@ public class BazelRuleClassProvider {
|
||||
env.put("PATH", null);
|
||||
}
|
||||
|
||||
+ Map<String, String> spackEnv = System.getenv();
|
||||
+ for (String envName : spackEnv.keySet()) {
|
||||
+ if (envName.startsWith("SPACK_")) {
|
||||
+ env.put(envName, spackEnv.get(envName));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
// Shell environment variables specified via options take precedence over the
|
||||
// ones inherited from the fragments. In the long run, these fragments will
|
||||
// be replaced by appropriate default rc files anyway.
|
Reference in New Issue
Block a user