From b8a2ee2ca8ae1f66b40baea8fc413b2732e7ebaa Mon Sep 17 00:00:00 2001 From: waltl Date: Wed, 16 Mar 2022 10:38:55 -0700 Subject: [PATCH] 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 --- .../build/lib/rules/apple/AppleCommandLineOptions.java | 3 +++ 1 file changed, 3 insertions(+) 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 3dedbc6fd1d5ef..20be2cc0945520 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 @@ public FragmentOptions getHost() { host.applePlatforms = applePlatforms; host.incompatibleUseToolchainResolution = incompatibleUseToolchainResolution; + // Save host option for further use. + host.hostMacosMinimumOs = hostMacosMinimumOs; + return host; }