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

MacOS.locate: search HOMEBREW_PREFIX before xcrun

Browse Source 
Since xcrun doesn't work on CLT-only systems. Querying HOMEBREW_PREFIX
first before xcrun is much faster for that case.
This commit is contained in:
Misty De Meo 2013-07-26 23:21:44 -07:00
parent 613546a994
commit 6242a6d7fa
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/macos.rb
View File

@ -18,11 +18,16 @@ module MacOS extend self
# Give the name of the binary you look for as a string to this method # Give the name of the binary you look for as a string to this method
# in order to get the full path back as a Pathname. # in order to get the full path back as a Pathname.
(@locate ||= {}).fetch(tool.to_s) do (@locate ||= {}).fetch(tool.to_s) do
@locate[tool.to_s] = if File.executable? "/usr/bin/#{tool}" @locate[tool.to_s] = if File.executable?(path = "/usr/bin/#{tool}")
Pathname.new "/usr/bin/#{tool}" Pathname.new path
# Homebrew GCCs most frequently; much faster to check this before xcrun
# This also needs to be queried if xcrun won't work, e.g. CLT-only
elsif File.executable?(path = "#{HOMEBREW_PREFIX}/bin/#{tool}")
Pathname.new path
else else
# If the tool isn't in /usr/bin, then we first try to use xcrun to find # If the tool isn't in /usr/bin or from Homebrew,
# it. If it's not there, or xcode-select is misconfigured, we have to # then we first try to use xcrun to find it.
# If it's not there, or xcode-select is misconfigured, we have to
# look in dev_tools_path, and finally in xctoolchain_path, because the # look in dev_tools_path, and finally in xctoolchain_path, because the
# tools were split over two locations beginning with Xcode 4.3+. # tools were split over two locations beginning with Xcode 4.3+.
xcrun_path = unless Xcode.bad_xcode_select_path? xcrun_path = unless Xcode.bad_xcode_select_path?