xcode_configure repository rule for determining locally installed versions of xcode to select between, relaxing the requirement that users specify --xcode_version and --ios_sdk_version even if they have only one version installed.

RELNOTES: On mac devices, detect locally installed versions of xcode to:
 1. Use a sensible default if xcode is required but --xcode_version is unspecified.
 2. Use sensible default iOS SDK version for the targeted version of xcode if ios_sdk_version is unspecified.

--
MOS_MIGRATED_REVID=131841587

1 files changed, 10 insertions, 7 deletions

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 c110cbbd49..b014ecc7fd 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
@@ -26,7 +26,6 @@ import com.google.devtools.build.lib.rules.apple.Platform.PlatformType;
 import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter;
 import com.google.devtools.common.options.EnumConverter;
 import com.google.devtools.common.options.Option;
-
 import java.util.List;
 
 /**
@@ -150,18 +149,22 @@ public class AppleCommandLineOptions extends FragmentOptions {
       converter = DefaultProvisioningProfileConverter.class)
   public Label defaultProvisioningProfile;
 
-  @Option(name = "xcode_version_config",
-      defaultValue = "@bazel_tools" + DEFAULT_XCODE_VERSION_CONFIG_LABEL,
-      category = "undocumented",
-      converter = LabelConverter.class,
-      help = "The label of the xcode_config rule to be used for selecting the xcode version "
-          + "in the build configuration")
+  @Option(
+    name = "xcode_version_config",
+    defaultValue = "@local_config_xcode//:host_xcodes",
+    category = "undocumented",
+    converter = LabelConverter.class,
+    help =
+        "The label of the xcode_config rule to be used for selecting the xcode version "
+            + "in the build configuration"
+  )
   public Label xcodeVersionConfig;
 
   /**
    * The default label of the build-wide {@code xcode_config} configuration rule. This can be
    * changed from the default using the {@code xcode_version_config} build flag.
    */
+  // TODO(cparsons): Update all callers to reference the actual xcode_version_config flag value.
   static final String DEFAULT_XCODE_VERSION_CONFIG_LABEL = "//tools/objc:host_xcodes";
 
   /** Converter for --default_ios_provisioning_profile. */