Skip to content

Commit

Permalink
Automated rollback of commit c7bb751.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Breaks bazel-determism-test, see https://storage.googleapis.com/bazel-buildkite-artifacts/c47d7f55-a16a-41d8-a1ca-d221b4568907/src/test/shell/bazel/bazel_determinism_test/attempt_1.log

RELNOTES: None.
PiperOrigin-RevId: 228320163
  • Loading branch information
meisterT authored and Copybara-Service committed Jan 8, 2019
1 parent fe8085a commit 1ed98e7
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -349,14 +349,14 @@ filegroup(
"_nojdk",
]]

[genrule(
name = "bazel-bin" + suffix,
srcs = [":bazel-bin" + jdk],
outs = ["bazel" + suffix],
genrule(
name = "bazel-bin",
srcs = [":bazel-bin_jdk_allmodules"],
outs = ["bazel"],
# In msys, a file path without .exe suffix(say foo), refers to a file with .exe
# suffix(say foo.exe), if foo.exe exists and foo doesn't. So, on windows, we
# need to remove bazel.exe first, so that cat to bazel won't fail.
cmd = "rm -f $@; cp $(location :bazel-bin" + jdk + ") $@",
cmd = "rm -f $@; cp $(location :bazel-bin_jdk_allmodules) $@",
executable = 1,
output_to_bindir = 1,
visibility = [
Expand All @@ -365,10 +365,7 @@ filegroup(
"//src/java:__subpackages__", # For command line reference generation
"//src/test:__subpackages__", # For integration tests
],
) for suffix, jdk in [
("-dev", "_jdk_allmodules"),
("", "_jdk_minimal"),
]]
)

# Build an executable named `bazel.exe`.
# Works on all platforms but only makes sense on Windows.
Expand Down

0 comments on commit 1ed98e7

Please sign in to comment.