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

[5.1] Fix conflicting actions error when specifying --host_macos_minimum_os #15068

Conversation

brentleyjones
Copy link
Contributor

The flag was introduced in #13001 but not usable internally, because
the host flag was not saved when doing a transition. Host flags
should be saved, like in:

https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java#L1212

(cherry picked from commit b8a2ee2)

Fixes issues like bazelbuild/rules_swift#777.

The flag was introduced in bazelbuild#13001 but not usable internally, because
the host flag was not saved when doing a transition.  Host flags
should be saved, like in:

https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java#L1212

PiperOrigin-RevId: 435091962
(cherry picked from commit b8a2ee2)
@brentleyjones
Copy link
Contributor Author

@Wyverald

@lberki lberki requested review from allevato and removed request for lberki March 18, 2022 08:43
@lberki
Copy link
Contributor

lberki commented Mar 18, 2022

Given that Tony reviewed #13001, I assume he is the right person for this one, too?

/cc @gregestren

@thii
Copy link
Member

thii commented Mar 18, 2022

This is only a cherry-pick of a change that is already landed.

@Wyverald Wyverald merged commit 267142f into bazelbuild:release-5.1.0 Mar 18, 2022
@brentleyjones brentleyjones deleted the bj/fix-conflicting-actions-error-when-specifying-host_macos_minimum_os branch April 5, 2022 14:22
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

Successfully merging this pull request may close these issues.

None yet

5 participants