| commit | 267142f3dc6b8d32b07beb21e3b4ba6f471a69d8 | [log] [tgz] |
|---|---|---|
| author | Brentley Jones <github@brentleyjones.com> | Fri Mar 18 07:21:39 2022 -0500 |
| committer | GitHub <noreply@github.com> | Fri Mar 18 23:21:39 2022 +1100 |
| tree | 692d4388c13257efb6e086ff8aa9254a81932238 | |
| parent | 4c031d1030afb1cb48c7e6d71f83cc99fea607c1 [diff] |
Fix conflicting actions error when specifying --host_macos_minimum_os (#15068) 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 (cherry picked from commit b8a2ee2ca8ae1f66b40baea8fc413b2732e7ebaa) 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 index ceef262..13bfeec 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
@@ -511,6 +511,9 @@ host.includeXcodeExecutionRequirements = includeXcodeExecutionRequirements; host.appleCrosstoolTop = appleCrosstoolTop; + // Save host option for further use. + host.hostMacosMinimumOs = hostMacosMinimumOs; + return host; }