commit b8a2ee2ca8ae1f66b40baea8fc413b2732e7ebaa
author waltl <waltl@google.com> Wed Mar 16 10:38:55 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Mar 16 10:40:32 2022 -0700
tree 5a24a2f0f4ad63ea1dd1736a3622f7bd6ff69f72
parent 1b2cf8d596a98abe3f02f711903435e060f76720

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

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

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
index 3dedbc6..20be2cc 100644
--- 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 @@
     host.applePlatforms = applePlatforms;
     host.incompatibleUseToolchainResolution = incompatibleUseToolchainResolution;
 
+    // Save host option for further use.
+    host.hostMacosMinimumOs = hostMacosMinimumOs;
+
     return host;
   }