Fix conflicting actions error when specifying --host_macos_minimum_os (bazelbuild#15068)

brentleyjones · googlewalt · web-flow · commit 267142f3dc6b · 2022-03-18T23:21:39.000+11: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 (cherry picked from commit b8a2ee2) Co-authored-by: waltl <waltl@google.com>
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
@@ -511,6 +511,9 @@ public FragmentOptions getHost() {
     host.includeXcodeExecutionRequirements = includeXcodeExecutionRequirements;
     host.appleCrosstoolTop = appleCrosstoolTop;
 
+    // Save host option for further use.
+    host.hostMacosMinimumOs = hostMacosMinimumOs;
+
     return host;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -511,6 +511,9 @@ public FragmentOptions getHost() {`
`511`	`511`	`host.includeXcodeExecutionRequirements = includeXcodeExecutionRequirements;`
`512`	`512`	`host.appleCrosstoolTop = appleCrosstoolTop;`
`513`	`513`
	`514`	`+ // Save host option for further use.`
	`515`	`+ host.hostMacosMinimumOs = hostMacosMinimumOs;`
	`516`	`+`
`514`	`517`	`return host;`
`515`	`518`	`}`
`516`	`519`