aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorJack Nagel2014-05-13 10:48:13 -0500
committerJack Nagel2014-05-13 11:28:44 -0500
commit9fc5a543d5f7f96a37dc931e06cad8a6978f41a6 (patch)
tree3b93cd596644f8db0f00e4c2bf563c1b2fe1c67f /Library/Homebrew
parent43d9640cb667267494ddad3e853233fe7148c5df (diff)
downloadbrew-9fc5a543d5f7f96a37dc931e06cad8a6978f41a6.tar.bz2
No need to augment path on Xcode-only 10.9
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/extend/ENV/super.rb6
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}