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

Don't call xcrun twice

Browse Source
This commit is contained in:
Jack Nagel 2014-04-15 11:25:00 -05:00
parent 2f052a2f65
commit b78a4b7372
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,10 +60,9 @@ module OS
elsif tools_in_prefix? "/" elsif tools_in_prefix? "/"
# probably a safe enough assumption (the unix way) # probably a safe enough assumption (the unix way)
Pathname.new "/usr/bin" Pathname.new "/usr/bin"
elsif not `/usr/bin/xcrun -find make 2>/dev/null`.empty? elsif not (make_path = `/usr/bin/xcrun -find make 2>/dev/null`).empty?
# Note that the exit status of system "xcrun foo" isn't always accurate # Note that the exit status of system "xcrun foo" isn't always accurate
# Wherever "make" is there are the dev tools. Pathname.new(make_path.chomp).dirname
Pathname.new(`/usr/bin/xcrun -find make`.chomp).dirname
elsif File.exist? "#{Xcode.prefix}/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 # cc stopped existing with Xcode 4.3, there are c89 and c99 options though
Pathname.new "#{Xcode.prefix}/usr/bin" Pathname.new "#{Xcode.prefix}/usr/bin"