admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Elaborate on why we should remove this code

Browse Source
This commit is contained in:
Jack Nagel 2014-04-19 21:39:40 -05:00
parent 174a9a76b4
commit bac25a77bf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/os/mac/xcode.rb
View File

@ -46,9 +46,12 @@ module OS
if path != CLT::MAVERICKS_PKG_PATH and path.absolute? \ if path != CLT::MAVERICKS_PKG_PATH and path.absolute? \
and File.executable? "#{path}/usr/bin/make" and File.executable? "#{path}/usr/bin/make"
path path
# TODO remove this branch when 10.10 is released
elsif File.executable? "#{V4_BUNDLE_PATH}/Contents/Developer/usr/bin/make" elsif File.executable? "#{V4_BUNDLE_PATH}/Contents/Developer/usr/bin/make"
# fallback for broken Xcode 4.3 installs # TODO Remove this branch when 10.10 is released
# This is a fallback for broken installations of Xcode 4.3+. Correct
# installations will be handled by the first branch. Pretending that
# broken installations are OK just leads to hard to diagnose problems
# later.
Pathname.new("#{V4_BUNDLE_PATH}/Contents/Developer") Pathname.new("#{V4_BUNDLE_PATH}/Contents/Developer")
elsif (path = bundle_path) elsif (path = bundle_path)
path += "Contents/Developer" path += "Contents/Developer"