From 36882e0fc7b4010267e5ac9383001d11cdb0745e Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Mon, 16 May 2016 12:42:54 +0200 Subject: [PATCH] [system-dependencies] Ensure xcode-select points to the Xcode we care about. --- system-dependencies.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/system-dependencies.sh b/system-dependencies.sh index e7e4497336a6..7614d3aaf3cf 100755 --- a/system-dependencies.sh +++ b/system-dependencies.sh @@ -232,6 +232,16 @@ function check_specific_xcode () { return fi + local XCODE_SELECT=$(xcode-select -p) + if [[ "x$XCODE_SELECT" != "x$XCODE_DEVELOPER_ROOT" ]]; then + if ! test -z $PROVISION_XCODE; then + log "Executing 'sudo xcode-select -s $XCODE_DEVELOPER_ROOT'" + sudo xcode-select -s $XCODE_DEVELOPER_ROOT + else + fail "'xcode-select -p' does not point to $XCODE_DEVELOPER_ROOT, it points to $XCODE_SELECT. Execute 'sudo xcode-select -s $XCODE_DEVELOPER_ROOT' to fix." + fi + fi + ok "Found Xcode $XCODE_ACTUAL_VERSION in $XCODE_ROOT" }