Skip to content

Commit

Permalink
Remove superfluous bazel_toolchains patch
Browse files Browse the repository at this point in the history
This is effectively a revert of
bazelbuild@8946cc1.

I originally needed to rename an attribute in `bazel_toolchains` for
bazelbuild@22b4dbc. The `target_compatible_with`
attribute used in one of the repository rules clashed with the
attribute I added in the Incompatible Target Skipping patch. Once we
merged 22b4dbc we realized that we
broke a bunch of projects because they pulled in unpatched versions of
`bazel_toolchains`.

John Cater (@katre) noticed that we can fix everything by making the
new attribute not apply to repository rules. He submitted
bazelbuild@775a979 to fix this.

That means that the original patch I added is actually not needed
anymore.

A follow-up patch will delete the .patch file from the source tree.

Closes bazelbuild#12396.

PiperOrigin-RevId: 340291830
  • Loading branch information
philsc authored and copybara-github committed Nov 2, 2020
1 parent fb309f3 commit 4e2a330
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -432,10 +432,8 @@ http_file(

http_archive(
name = "bazel_toolchains",
patch_args = ["-p1"],
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
patches = ["@//third_party:bazel_toolchains/0001-Rename-target_compatible_with-to-internal_target_com.patch"],
sha256 = "726b5423e1c7a3866a3a6d68e7123b4a955e9fcbe912a51e0f737e6dab1d0af2",
strip_prefix = "bazel-toolchains-3.1.0",
urls = [
Expand Down

0 comments on commit 4e2a330

Please sign in to comment.