diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2018-11-13 11:05:17 -0600 |
---|---|---|
committer | Todd Gamblin <tgamblin@llnl.gov> | 2018-11-13 11:05:17 -0600 |
commit | 42962f2409fe7b46543dc5974c45bb6392fcea99 (patch) | |
tree | 2063188dd6902f9b6ea7e8a2601f6131ac88046d /var/spack/repos/builtin/packages/bazel/fix_env_handling.patch | |
parent | 041aa143db6964575625f1849de639541efb83a5 (diff) | |
parent | 8554e933d2a236df20d07a6e0416ab444790bd3d (diff) | |
download | spack-42962f2409fe7b46543dc5974c45bb6392fcea99.tar.gz spack-42962f2409fe7b46543dc5974c45bb6392fcea99.tar.bz2 spack-42962f2409fe7b46543dc5974c45bb6392fcea99.tar.xz spack-42962f2409fe7b46543dc5974c45bb6392fcea99.zip |
Merge branch 'releases/v0.12'v0.12.0
Diffstat (limited to 'var/spack/repos/builtin/packages/bazel/fix_env_handling.patch')
-rw-r--r-- | var/spack/repos/builtin/packages/bazel/fix_env_handling.patch | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch b/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch index 9be9f97d69..14deccf950 100644 --- a/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch +++ b/var/spack/repos/builtin/packages/bazel/fix_env_handling.patch @@ -1,7 +1,7 @@ diff -pu bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java --- bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2016-09-14 11:56:01.565756979 +0200 +++ bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2016-09-14 12:04:13.292839801 +0200 -@@ -92,5 +92,115 @@ public class BazelConfiguration extends +@@ -92,5 +92,120 @@ public class BazelConfiguration extends if (tmpdir != null) { builder.put("TMPDIR", tmpdir); } @@ -16,6 +16,11 @@ diff -pu bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/Baz + builder.put("SPACK_ENV_PATH", spack_env_path); + } + ++ String spack_debug_log_id = System.getenv("SPACK_DEBUG_LOG_ID"); ++ if (spack_debug_log_id != null) { ++ builder.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) { + builder.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir); |