448e09e5b2
* 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
17 lines
592 B
Diff
17 lines
592 B
Diff
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
|
|
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
|
|
@@ -150,6 +150,13 @@
|
|
builder.put("PATH", null);
|
|
builder.put("LD_LIBRARY_PATH", null);
|
|
}
|
|
+
|
|
+ Map<String, String> spackEnv = System.getenv();
|
|
+ for (String envName : spackEnv.keySet()) {
|
|
+ if (envName.startsWith("SPACK_")) {
|
|
+ builder.put(envName, spackEnv.get(envName));
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
private static PathFragment determineShellExecutable(OS os, PathFragment fromOption) {
|