Skip to content

Commit

Permalink
Revert "Remove an obsolete workaround from .bazelrc"
Browse files Browse the repository at this point in the history
This reverts commit de7615f.

It turns out that --cpu command line option will be silently ignored
with Bazel 7.0 and later unless

  --noincompatible_enable_cc_toolchain_resolution

option is specified [1]. Otherwise 'mozc_tip32.dll' will be built as
a 64-bit executable.

This is a temporary workaround until until we fully migrate to

--platforms

command line option [2].

This commit only affects Windows build with Bazel. Other build
configurations such as GYP build on Windows are not affected.

Closes google#1102.

 [1]: bazelbuild/bazel#7260
 [2]: https://bazel.build/concepts/platforms
  • Loading branch information
yukawa committed Oct 30, 2024
1 parent 4a1069a commit e223ace
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ 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 e223ace

Please sign in to comment.