Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.4.0] Cherry-pick commits to fix a Windows issue #19222

Closed
keertk opened this issue Aug 10, 2023 · 4 comments
Closed

[6.4.0] Cherry-pick commits to fix a Windows issue #19222

keertk opened this issue Aug 10, 2023 · 4 comments

Comments

@keertk
Copy link
Member

keertk commented Aug 10, 2023

Cherry-pick 5647b26 and 138f06f into 6.4

@bazelbuild/triage

@keertk keertk added this to the 6.4.0 release blockers milestone Aug 10, 2023
@iancha1992
Copy link
Member

iancha1992 commented Aug 10, 2023

@meteorcloudy
There are conflicts when trying to cherry-pick both commits.

  1. For 5647b26,
    In the .bazelrc file, below code is not in the release-6.4.0 branch. But it exists in the master branch.
# Fail if a glob doesn't match anything (https://github.com/bazelbuild/bazel/issues/8195)
build --incompatible_disallow_empty_glob
  1. For 138f06f
    In the .bazelrc file, below code is not in the release-6.4.0 branch. But it exists in the master branch.
# On Windows, we need pywin32 pip package, which doesn't work with the Python hermetic toolchain.
# See https://github.com/bazelbuild/rules_python/issues/1356
# Therefore, use the local detected Python toolchain on Windows.
build:windows --extra_toolchains=@bazel_tools//tools/python:autodetecting_toolchain

If another commit is not necessary, I can just accept the incoming change and then submit a PR. Let us know please.

cc: @bazelbuild/triage

@meteorcloudy
Copy link
Member

138f06f is still necessary, can you try to resolve the conflict, basically, we just need to add the following two lines to .bazelrc, we can ignore the rest.

build:windows_arm64 --platforms=//:windows_arm64
build:windows_arm64 --extra_toolchains=@local_config_cc//:cc-toolchain-arm64_windows

Thanks!

@meteorcloudy
Copy link
Member

Oh, we also need d0de5e0, sorry for missing this one!

@iancha1992
Copy link
Member

Cherry-picked in #19232

cc: @bazelbuild/triage

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants