Skip to content

Commit 267142f

Browse files
Fix conflicting actions error when specifying --host_macos_minimum_os (bazelbuild#15068)
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) Co-authored-by: waltl <[email protected]>
1 parent 4c031d1 commit 267142f

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

+3
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,9 @@ public FragmentOptions getHost() {
511511
host.includeXcodeExecutionRequirements = includeXcodeExecutionRequirements;
512512
host.appleCrosstoolTop = appleCrosstoolTop;
513513

514+
// Save host option for further use.
515+
host.hostMacosMinimumOs = hostMacosMinimumOs;
516+
514517
return host;
515518
}
516519

0 commit comments

Comments
 (0)