From 2856a97ce37e63b27f2b1bd00f7ea7c0378b0724 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Fri, 31 Aug 2012 10:21:06 -0400 Subject: [PATCH] Refs Homebrew/homebrew#14558. Try to find tools when xcrun fails. --- Library/ENV/4.3/xcrun | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Library/ENV/4.3/xcrun b/Library/ENV/4.3/xcrun index 3d2dd642ec..49d99a644f 100755 --- a/Library/ENV/4.3/xcrun +++ b/Library/ENV/4.3/xcrun @@ -4,7 +4,24 @@ # NOTE only works if they call xcrun without a full-path. Cross your fingers! if [ $HOMEBREW_SDKROOT ]; then - exec /usr/bin/xcrun "$@" + arg0="$1" + shift + + path=$(/usr/bin/xcrun -find $arg0) + [ -x "$path" ] && exec "$path" "$@" + + # Nuts, Xcode is not setup properly or something. + # Try to find the tools anyway! + path="/Applications/Xcode.app/Contents/Developer/usr/bin/$arg0" + [ -x "$path" ] && exec "$path" "$@" + path="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/$arg0" + [ -x "$path" ] && exec "$path" "$@" + + echo "Your Xcode setup is not ready. You need to either:" + echo " sudo xcode-select -switch /path/to/Xcode.app" + echo "or:" + echo " xcodebuild -license" + exit 1 else cmd="$1" shift