diff options
| author | Camillo Lugaresi | 2014-04-28 15:32:53 -0700 |
|---|---|---|
| committer | Jack Nagel | 2014-07-03 16:25:59 -0500 |
| commit | 90f3142d6da61dc02673ddaf7a1c002640f7afb5 (patch) | |
| tree | d94758bbebd616e45498f185ebf4da6a9708cf11 /Library/Homebrew/extend | |
| parent | e62dcaa5d481aad92a3d9f8a268968dcfdc6b602 (diff) | |
| download | homebrew-90f3142d6da61dc02673ddaf7a1c002640f7afb5.tar.bz2 | |
stop Xcode tools from overriding deps when CLT is not installed
Closes #30641.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index dc7a0183e..f7fd19cc4 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -110,6 +110,9 @@ module Superenv def determine_path paths = [Superenv.bin] + # Formula dependencies can override standard tools. + paths += deps.map { |dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" } + # 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" @@ -117,7 +120,6 @@ module Superenv paths << "#{MacOS::Xcode.toolchain_path}/usr/bin" end - paths += deps.map { |dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" } paths << MacOS::X11.bin.to_s if x11? paths += %w{/usr/bin /bin /usr/sbin /sbin} |