aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2013-01-31 21:47:19 -0800
committerMike McQuaid2013-01-31 21:48:28 -0800
commitb1bc9ec809923782be6cfb7ff71e5c6cf9f98daa (patch)
tree4f8cbd9ebcad6199bbe60ae36161e3618bcf1ca5 /Library
parente851e88863cec98b2b8357cc991fc3991044a5cf (diff)
downloadbrew-b1bc9ec809923782be6cfb7ff71e5c6cf9f98daa.tar.bz2
Don't let xcrun find superenv tools.
Causes an infinite loop when trying to find e.g. missing gcc. Closes Homebrew/homebrew#17426 References Homebrew/homebrew#17455
Diffstat (limited to 'Library')
-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}]