aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-04-01 18:51:34 -0500
committerJack Nagel2014-04-01 18:51:34 -0500
commitf517682409f8d0ab641971530dc8fb2e726e419b (patch)
tree0ccde9099dcfefd644f4db6192cbcc876decb87f
parent607b6d8d9b1718bf696c081729085aff75c0c56c (diff)
downloadhomebrew-f517682409f8d0ab641971530dc8fb2e726e419b.tar.bz2
Avoid calling xcodebuild twice
-rw-r--r--Library/Homebrew/os/mac/xcode.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb
index c55ef0f27..b64fc6edb 100644
--- a/Library/Homebrew/os/mac/xcode.rb
+++ b/Library/Homebrew/os/mac/xcode.rb
@@ -101,7 +101,9 @@ module OS
# Xcode 4.3 xc* tools hang indefinately if xcode-select path is set thus
raise if bad_xcode_select_path?
- raise unless which "xcodebuild"
+ xcodebuild = which "xcodebuild"
+ raise unless xcodebuild && xcodebuild != xcode43build
+
`xcodebuild -version 2>/dev/null` =~ /Xcode (\d(\.\d)*)/
raise if $1.nil? or not $?.success?
$1