Skip to content

Commit b8a2ee2

Browse files
googlewaltcopybara-github
authored andcommitted
Fix conflicting actions error when specifying --host_macos_minimum_os
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 PiperOrigin-RevId: 435091962
1 parent 1b2cf8d commit b8a2ee2

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,9 @@ public FragmentOptions getHost() {
521521
host.applePlatforms = applePlatforms;
522522
host.incompatibleUseToolchainResolution = incompatibleUseToolchainResolution;
523523

524+
// Save host option for further use.
525+
host.hostMacosMinimumOs = hostMacosMinimumOs;
526+
524527
return host;
525528
}
526529

0 commit comments

Comments
 (0)