bazel --xcode_version flag to forward an environment variable XCODE_VERSION_OVERRIDE to executors if specified

--
MOS_MIGRATED_REVID=102049561

1 files changed, 9 insertions, 5 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index 589b37f43b..d1b81e9048 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -149,8 +149,10 @@ public class ObjcRuleClasses {
   /**
    * Creates a new spawn action builder that requires a darwin architecture to run.
    */
-  static SpawnAction.Builder spawnOnDarwinActionBuilder() {
+  static SpawnAction.Builder spawnOnDarwinActionBuilder(RuleContext ruleContext) {
+    ObjcConfiguration objcConfiguration = objcConfiguration(ruleContext);
     return new SpawnAction.Builder()
+        .setEnvironment(objcConfiguration.getEnvironmentForDarwin())
         .setExecutionInfo(ImmutableMap.of(ExecutionRequirements.REQUIRES_DARWIN, ""));
   }
 
@@ -160,8 +162,9 @@ public class ObjcRuleClasses {
    */
   // TODO(bazel-team): Reference a rule target rather than a jar file when Darwin runfiles work
   // better.
-  static SpawnAction.Builder spawnJavaOnDarwinActionBuilder(Artifact deployJarArtifact) {
-    return spawnOnDarwinActionBuilder()
+  static SpawnAction.Builder spawnJavaOnDarwinActionBuilder(RuleContext ruleContext,
+      Artifact deployJarArtifact) {
+    return spawnOnDarwinActionBuilder(ruleContext)
         .setExecutable(JAVA)
         .addExecutableArguments("-jar", deployJarArtifact.getExecPathString())
         .addInput(deployJarArtifact);
@@ -174,8 +177,9 @@ public class ObjcRuleClasses {
    * directly, but right now we don't have a buildhelpers package on Macs so we must specify
    * the path to /bin/bash explicitly.
    */
-  static SpawnAction.Builder spawnBashOnDarwinActionBuilder(String cmd) {
-    return spawnOnDarwinActionBuilder().setShellCommand(ImmutableList.of("/bin/bash", "-c", cmd));
+  static SpawnAction.Builder spawnBashOnDarwinActionBuilder(RuleContext ruleContext, String cmd) {
+    return spawnOnDarwinActionBuilder(ruleContext)
+        .setShellCommand(ImmutableList.of("/bin/bash", "-c", cmd));
   }
 
   /**