aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMike McQuaid2013-01-31 21:47:19 -0800
committerMike McQuaid2013-01-31 21:48:28 -0800
commitddf4d1f603ae659e295649465e0cc099ac210c7d (patch)
treec796b62cca3b85266aa1071c9a385b497c5f7be7 /Library/Homebrew
parent238a2f02bce07d74d2bfc2532bcedcd3f09d6a6a (diff)
downloadhomebrew-ddf4d1f603ae659e295649465e0cc099ac210c7d.tar.bz2
Don't let xcrun find superenv tools.
Causes an infinite loop when trying to find e.g. missing gcc. Closes #17426 References #17455
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/macos.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb
index 891e458f3..47573e3a3 100644
--- a/Library/Homebrew/macos.rb
+++ b/Library/Homebrew/macos.rb
@@ -39,6 +39,9 @@ module MacOS extend self
`/usr/bin/xcrun -find #{tool} 2>/dev/null`.chomp
end
+ # If xcrun finds a superenv tool then discard the result.
+ xcrun_path = nil if xcrun_path.include? HOMEBREW_PREFIX+"Library/ENV"
+
paths = %W[#{xcrun_path}
#{dev_tools_path}/#{tool}
#{xctoolchain_path}/usr/bin/#{tool}]