aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorJack Nagel2014-05-13 10:48:13 -0500
committerJack Nagel2014-05-13 11:28:44 -0500
commitf1a583b47afc5788e752e6d4a93255b44afc3df3 (patch)
treeaca704a5ab5232528956ca0fcdc75b809cebdf31 /Library/Homebrew/extend
parentad4f4f70e77aa2219931b9942af2d41cecb2100d (diff)
downloadhomebrew-f1a583b47afc5788e752e6d4a93255b44afc3df3.tar.bz2
No need to augment path on Xcode-only 10.9
Diffstat (limited to 'Library/Homebrew/extend')
-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}