Skip to content

Commit

Permalink
Fix conflicting actions error when specifying --host_macos_minimum_os (
Browse files Browse the repository at this point in the history
…bazelbuild#15068)

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 <[email protected]>
  • Loading branch information
brentleyjones and googlewalt authored Mar 18, 2022
1 parent 4c031d1 commit 267142f
Showing 1 changed file with 3 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,9 @@ public FragmentOptions getHost() {
host.includeXcodeExecutionRequirements = includeXcodeExecutionRequirements;
host.appleCrosstoolTop = appleCrosstoolTop;

// Save host option for further use.
host.hostMacosMinimumOs = hostMacosMinimumOs;

return host;
}

Expand Down

0 comments on commit 267142f

Please sign in to comment.