Skip to content

Commit ad3bee0

Browse files
authored
Revert "Remove an obsolete workaround from .bazelrc" (#1103)
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 #1102. [1]: bazelbuild/bazel#7260 [2]: https://bazel.build/concepts/platforms PiperOrigin-RevId: 691409234
1 parent d94101b commit ad3bee0

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/.bazelrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ test:macos_env --test_tag_filters=-nomac
6565
build:windows_env --build_tag_filters=-nowin
6666
test:windows_env --test_tag_filters=-nowin
6767

68+
# A temporary workaround to make "mozc_win_build_rule" work.
69+
# Note that "incompatible_enable_cc_toolchain_resolution" is now enabled by
70+
# default. See https://github.com/bazelbuild/bazel/issues/7260
71+
# TODO: Re-enable "incompatible_enable_cc_toolchain_resolution"
72+
build:windows_env --noincompatible_enable_cc_toolchain_resolution
73+
6874
# Android specific options
6975
build:android_env --copt "-DOS_ANDROID"
7076
build:android_env --build_tag_filters=-noandroid

0 commit comments

Comments
 (0)