aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/osx
diff options
context:
space:
mode:
authorGravatar cparsons <cparsons@google.com>2017-06-05 17:59:02 -0400
committerGravatar John Cater <jcater@google.com>2017-06-06 09:50:39 -0400
commit091636557f56e32215d9846528fe5a0eab55477a (patch)
tree861e19b14a9c168d2aa73eab1316b1d19ca63956 /tools/osx
parentcd95f3cbd25c58d7fba964ac8b61ef63fb8585c1 (diff)
Suggest signing xcode license if that likely inhibits xcode-locator-bin generation
RELNOTES: None. PiperOrigin-RevId: 158066648
Diffstat (limited to 'tools/osx')
-rw-r--r--tools/osx/xcode_configure.bzl7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl
index 6a8524a864..15bbba249b 100644
--- a/tools/osx/xcode_configure.bzl
+++ b/tools/osx/xcode_configure.bzl
@@ -118,9 +118,14 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
"xcode-locator-bin", xcodeloc_src_path], 30)
if (xcrun_result.return_code != 0):
+ suggestion = ""
+ if "Agreeing to the Xcode/iOS license" in xcrun_result.stderr:
+ suggestion = ("(You may need to sign the xcode license." +
+ " Try running 'sudo xcodebuild -license')")
error_msg = (
- "Generating xcode-locator-bin failed, " +
+ "Generating xcode-locator-bin failed. {suggestion} " +
"return code {code}, stderr: {err}, stdout: {out}").format(
+ suggestion=suggestion,
code=xcrun_result.return_code,
err=xcrun_result.stderr,
out=xcrun_result.stdout)