Skip to content

Commit

Permalink
Remove an obsolete workaround from .bazelrc
Browse files Browse the repository at this point in the history
This follows up to my previous commit [1], which was added as a
temporary workaround while working on Bazel build for Windows (#google#948).

As of Bazel 7.3.2 with bzlmod enabled,

  --noincompatible_enable_cc_toolchain_resolution

looks to be no longer necessary. Let's remove it for simplicity.

 [1]: 5efa371

#codehealth

PiperOrigin-RevId: 681690120
  • Loading branch information
yukawa authored and hiroyuki-komatsu committed Oct 3, 2024
1 parent 269a246 commit de7615f
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ test:macos_env --test_tag_filters=-nomac
build:windows_env --build_tag_filters=-nowin
test:windows_env --test_tag_filters=-nowin

# A temporary workaround to make "mozc_win_build_rule" work.
# Note that "incompatible_enable_cc_toolchain_resolution" is now enabled by
# default. See https://github.com/bazelbuild/bazel/issues/7260
# TODO: Re-enable "incompatible_enable_cc_toolchain_resolution"
build:windows_env --noincompatible_enable_cc_toolchain_resolution

# Android specific options
build:android_env --copt "-DOS_ANDROID"
build:android_env --build_tag_filters=-noandroid
Expand Down

0 comments on commit de7615f

Please sign in to comment.