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

No need to augment path on Xcode-only 10.9

Browse Source
This commit is contained in:
Jack Nagel 2014-05-13 10:48:13 -05:00
parent 43d9640cb6
commit 9fc5a543d5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/extend/ENV/super.rb
View File

@ -119,10 +119,14 @@ module Superenv
def determine_path def determine_path
paths = [Superenv.bin] paths = [Superenv.bin]
if MacOS::Xcode.without_clt?
# On 10.9, there are shims for all tools in /usr/bin.
# On 10.7 and 10.8 we need to add these directories ourselves.
if MacOS::Xcode.without_clt? && MacOS.version <= "10.8"
paths << "#{MacOS::Xcode.prefix}/usr/bin" paths << "#{MacOS::Xcode.prefix}/usr/bin"
paths << "#{MacOS::Xcode.toolchain_path}/usr/bin" paths << "#{MacOS::Xcode.toolchain_path}/usr/bin"
end end
paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" } paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" }
paths << MacOS::X11.bin if x11? paths << MacOS::X11.bin if x11?
paths += %w{/usr/bin /bin /usr/sbin /sbin} paths += %w{/usr/bin /bin /usr/sbin /sbin}