diff options
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 01ec3d084..c2c44c3bf 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -119,10 +119,14 @@ module Superenv def determine_path 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.toolchain_path}/usr/bin" end + paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" } paths << MacOS::X11.bin if x11? paths += %w{/usr/bin /bin /usr/sbin /sbin} |