Check "xcodebuild -version" first before building the xcode locator.

This prevents a warning on machines which have no xcode versions installed.

--
MOS_MIGRATED_REVID=135131956

1 files changed, 7 insertions, 7 deletions

diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl
index 62e0df6dcb..114f7abe93 100644
--- a/tools/osx/xcode_configure.bzl
+++ b/tools/osx/xcode_configure.bzl
@@ -83,6 +83,13 @@ VERSION_CONFIG_STUB = "xcode_config(name = 'host_xcodes')"
 
 def _darwin_build_file(repository_ctx):
   """Evaluates local system state to create xcode_config and xcode_version targets."""
+  xcodebuild_result = repository_ctx.execute(["xcodebuild", "-version"])
+  # "xcodebuild -version" failing may be indicative of no versions of xcode
+  # installed, which is an acceptable machine configuration to have for using
+  # bazel. Thus no warning should be emitted here.
+  if (xcodebuild_result.return_code != 0):
+    return VERSION_CONFIG_STUB
+
   xcodeloc_src_path = str(repository_ctx.path(Label(repository_ctx.attr.xcode_locator)))
   repository_ctx.execute(["xcrun", "clang", "-fobjc-arc", "-framework", "CoreServices", "-framework", "Foundation", "-o", "xcode-locator-bin", xcodeloc_src_path])
 
@@ -93,13 +100,6 @@ def _darwin_build_file(repository_ctx):
             code=xcode_locator_result.return_code,
             err=xcode_locator_result.stderr))
     return VERSION_CONFIG_STUB
-  xcodebuild_result = repository_ctx.execute(["xcodebuild", "-version"])
-  if (xcodebuild_result.return_code != 0):
-    print(
-        "Invoking xcodebuild failed, return code {code}, stderr: {err}".format(
-            code=xcodebuild_result.return_code,
-            err=xcodebuild_result.stderr))
-    return VERSION_CONFIG_STUB
 
   default_xcode_version = _search_string(xcodebuild_result.stdout, "Xcode ", "\n")
   default_xcode_target = ""