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

Implement MacOS.dev_tools_prefix a different way

Browse Source 
Avoid producing a dev_tools_path of "//usr/bin".

Fixes Homebrew/homebrew#24751.
Closes Homebrew/homebrew#24754.
This commit is contained in:
Jack Nagel 2013-11-28 19:22:57 -06:00
parent acd2bd0738
commit 06bf1c0f02
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Library/Homebrew/os/mac.rb
View File

@ -51,24 +51,22 @@ module OS
end
def dev_tools_prefix
@dev_tools_prefix ||= if tools_in_prefix? CLT::MAVERICKS_PKG_PATH
Pathname.new CLT::MAVERICKS_PKG_PATH
elsif tools_in_prefix? "/"
# probably a safe enough assumption (the unix way)
Pathname.new "/"
elsif not Xcode.bad_xcode_select_path? and not `/usr/bin/xcrun -find make 2>/dev/null`.empty?
# Note that the exit status of system "xcrun foo" isn't always accurate
# Wherever "make" is there are the dev tools.
Pathname.new(`/usr/bin/xcrun -find make`.chomp.sub('/usr/bin/make', ''))
elsif File.exist? "#{Xcode.prefix}/usr/bin/make"
# cc stopped existing with Xcode 4.3, there are c89 and c99 options though
Pathname.new Xcode.prefix
end
dev_tools_path.parent.parent
end
def dev_tools_path
@dev_tools_path ||= if File.exist? "#{dev_tools_prefix}/usr/bin/make"
Pathname.new "#{dev_tools_prefix}/usr/bin"
@dev_tools_path ||= if tools_in_prefix? CLT::MAVERICKS_PKG_PATH
Pathname.new "#{CLT::MAVERICKS_PKG_PATH}/usr/bin"
elsif tools_in_prefix? "/"
# probably a safe enough assumption (the unix way)
Pathname.new "/usr/bin"
elsif not Xcode.bad_xcode_select_path? and not `/usr/bin/xcrun -find make 2>/dev/null`.empty?
# Note that the exit status of system "xcrun foo" isn't always accurate
# Wherever "make" is there are the dev tools.
Pathname.new(`/usr/bin/xcrun -find make`.chomp).dirname
elsif File.exist? "#{Xcode.prefix}/usr/bin/make"
# cc stopped existing with Xcode 4.3, there are c89 and c99 options though
Pathname.new "#{Xcode.prefix}/usr/bin"
end
end