Fix conflicting actions error when specifying --host_macos_minimum_os

googlewalt · copybara-github · commit b8a2ee2ca8ae · 2022-03-16T10:40:32.000-07:00
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
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
@@ -521,6 +521,9 @@ public FragmentOptions getHost() {
     host.applePlatforms = applePlatforms;
     host.incompatibleUseToolchainResolution = incompatibleUseToolchainResolution;
 
+    // Save host option for further use.
+    host.hostMacosMinimumOs = hostMacosMinimumOs;
+
     return host;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -521,6 +521,9 @@ public FragmentOptions getHost() {`
`521`	`521`	`host.applePlatforms = applePlatforms;`
`522`	`522`	`host.incompatibleUseToolchainResolution = incompatibleUseToolchainResolution;`
`523`	`523`
	`524`	`+ // Save host option for further use.`
	`525`	`+ host.hostMacosMinimumOs = hostMacosMinimumOs;`
	`526`	`+`
`524`	`527`	`return host;`
`525`	`528`	`}`
`526`	`529`