1e75aef0e9
Building bazel yielded errors since commit cd9691d. The first commit
fixes the build for older bazel versions, the second commit adds new
versions and ports the patches to these versions.
132 lines
4.4 KiB
Diff
132 lines
4.4 KiB
Diff
diff --git 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
|
|
index 72c40ac..2e73530 100755
|
|
--- 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,126 @@ public class BazelRuleClassProvider {
|
|
env.put("PATH", null);
|
|
}
|
|
|
|
+ String spack_prefix = System.getenv("SPACK_PREFIX");
|
|
+ if (spack_prefix != null) {
|
|
+ env.put("SPACK_PREFIX", spack_prefix);
|
|
+ }
|
|
+
|
|
+ String spack_env_path = System.getenv("SPACK_ENV_PATH");
|
|
+ if (spack_env_path != null) {
|
|
+ env.put("SPACK_ENV_PATH", spack_env_path);
|
|
+ }
|
|
+
|
|
+ String spack_debug_log_id = System.getenv("SPACK_DEBUG_LOG_ID");
|
|
+ if (spack_debug_log_id != null) {
|
|
+ env.put("SPACK_DEBUG_LOG_ID", spack_debug_log_id);
|
|
+ }
|
|
+
|
|
+ String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR");
|
|
+ if (spack_debug_log_dir != null) {
|
|
+ env.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir);
|
|
+ }
|
|
+
|
|
+ String spack_compiler_spec = System.getenv("SPACK_COMPILER_SPEC");
|
|
+ if (spack_compiler_spec != null) {
|
|
+ env.put("SPACK_COMPILER_SPEC", spack_compiler_spec);
|
|
+ }
|
|
+
|
|
+ String spack_cc_rpath_arg = System.getenv("SPACK_CC_RPATH_ARG");
|
|
+ if (spack_cc_rpath_arg != null) {
|
|
+ env.put("SPACK_CC_RPATH_ARG", spack_cc_rpath_arg);
|
|
+ }
|
|
+
|
|
+ String spack_cxx_rpath_arg = System.getenv("SPACK_CXX_RPATH_ARG");
|
|
+ if (spack_cxx_rpath_arg != null) {
|
|
+ env.put("SPACK_CXX_RPATH_ARG", spack_cxx_rpath_arg);
|
|
+ }
|
|
+
|
|
+ String spack_f77_rpath_arg = System.getenv("SPACK_F77_RPATH_ARG");
|
|
+ if (spack_f77_rpath_arg != null) {
|
|
+ env.put("SPACK_F77_RPATH_ARG", spack_f77_rpath_arg);
|
|
+ }
|
|
+
|
|
+ String spack_fc_rpath_arg = System.getenv("SPACK_FC_RPATH_ARG");
|
|
+ if (spack_fc_rpath_arg != null) {
|
|
+ env.put("SPACK_FC_RPATH_ARG", spack_fc_rpath_arg);
|
|
+ }
|
|
+
|
|
+ String spack_short_spec = System.getenv("SPACK_SHORT_SPEC");
|
|
+ if (spack_short_spec != null) {
|
|
+ env.put("SPACK_SHORT_SPEC", spack_short_spec);
|
|
+ }
|
|
+
|
|
+ String spack_system_dirs = System.getenv("SPACK_SYSTEM_DIRS");
|
|
+ if (spack_system_dirs != null) {
|
|
+ env.put("SPACK_SYSTEM_DIRS", spack_system_dirs);
|
|
+ }
|
|
+
|
|
+ String spack_cc = System.getenv("SPACK_CC");
|
|
+ if (spack_cc != null) {
|
|
+ env.put("SPACK_CC", spack_cc);
|
|
+ }
|
|
+
|
|
+ String spack_cxx = System.getenv("SPACK_CXX");
|
|
+ if (spack_cxx != null) {
|
|
+ env.put("SPACK_CXX", spack_cxx);
|
|
+ }
|
|
+
|
|
+ String spack_f77 = System.getenv("SPACK_F77");
|
|
+ if (spack_f77 != null) {
|
|
+ env.put("SPACK_F77", spack_f77);
|
|
+ }
|
|
+
|
|
+ String spack_fc = System.getenv("SPACK_FC");
|
|
+ if (spack_fc != null) {
|
|
+ env.put("SPACK_FC", spack_fc);
|
|
+ }
|
|
+
|
|
+ String spack_cflags = System.getenv("SPACK_CFLAGS");
|
|
+ if (spack_cflags != null) {
|
|
+ env.put("SPACK_CFLAGS", spack_cflags);
|
|
+ }
|
|
+
|
|
+ String spack_cxxflags = System.getenv("SPACK_CXXFLAGS");
|
|
+ if (spack_cxxflags != null) {
|
|
+ env.put("SPACK_CXXFLAGS", spack_cxxflags);
|
|
+ }
|
|
+
|
|
+ String spack_fcflags = System.getenv("SPACK_FCFLAGS");
|
|
+ if (spack_fcflags != null) {
|
|
+ env.put("SPACK_FCFLAGS", spack_fcflags);
|
|
+ }
|
|
+
|
|
+ String spack_fflags = System.getenv("SPACK_FFLAGS");
|
|
+ if (spack_fflags != null) {
|
|
+ env.put("SPACK_FFLAGS", spack_fflags);
|
|
+ }
|
|
+
|
|
+ String spack_ldflags = System.getenv("SPACK_LDFLAGS");
|
|
+ if (spack_ldflags != null) {
|
|
+ env.put("SPACK_LDFLAGS", spack_ldflags);
|
|
+ }
|
|
+
|
|
+ String spack_ldlibs = System.getenv("SPACK_LDLIBS");
|
|
+ if (spack_ldlibs != null) {
|
|
+ env.put("SPACK_LDLIBS", spack_ldlibs);
|
|
+ }
|
|
+
|
|
+ String spack_debug = System.getenv("SPACK_DEBUG");
|
|
+ if (spack_debug != null) {
|
|
+ env.put("SPACK_DEBUG", spack_debug);
|
|
+ }
|
|
+
|
|
+ String spack_test_command = System.getenv("SPACK_TEST_COMMAND");
|
|
+ if (spack_test_command != null) {
|
|
+ env.put("SPACK_TEST_COMMAND", spack_test_command);
|
|
+ }
|
|
+
|
|
+ String spack_dependencies = System.getenv("SPACK_DEPENDENCIES");
|
|
+ if (spack_dependencies != null) {
|
|
+ env.put("SPACK_DEPENDENCIES", spack_dependencies);
|
|
+ }
|
|
+
|
|
// 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.
|