diff options
| author | Jack Nagel | 2014-04-01 18:51:34 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-01 18:51:34 -0500 |
| commit | 97ca3baedc127ac9d7352361178e2706917c729d (patch) | |
| tree | ad13b85c75f17783d1b8c6c390210c5fd00249b2 /Library/Homebrew/os/mac/xcode.rb | |
| parent | 66c8f2707c0bd24a356e9fb485c039795d93b246 (diff) | |
| download | brew-97ca3baedc127ac9d7352361178e2706917c729d.tar.bz2 | |
Avoid calling xcodebuild twice
Diffstat (limited to 'Library/Homebrew/os/mac/xcode.rb')
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 4 |
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 |