admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Hotfix for stack overflow

Browse Source 
Under certain circumstances, MacOS.locate and MacOS.dev_tools_path would call
each other recursively. This was limited to systems with Xcode minus the CLT.
See Homebrew/homebrew#13012.
This commit is contained in:
Misty De Meo 2012-06-25 15:13:35 -05:00
parent f165e0cf5f
commit 2baf6487d1
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/utils.rb
View File

@ -320,7 +320,7 @@ module MacOS extend self
# xcode-select is not configured properly (i.e. xctools_fucked?). # xcode-select is not configured properly (i.e. xctools_fucked?).
p = "#{MacOS.xcode_prefix}/Toolchains/XcodeDefault.xctoolchain/usr/bin/#{tool}" p = "#{MacOS.xcode_prefix}/Toolchains/XcodeDefault.xctoolchain/usr/bin/#{tool}"
if File.executable? p if File.executable? p
path Pathname.new p path = Pathname.new p
else else
path = nil path = nil
end end
@ -334,9 +334,6 @@ module MacOS extend self
@dev_tools_path ||= if File.exist? "/usr/bin/cc" and File.exist? "/usr/bin/make" @dev_tools_path ||= if File.exist? "/usr/bin/cc" and File.exist? "/usr/bin/make"
# probably a safe enough assumption (the unix way) # probably a safe enough assumption (the unix way)
Pathname.new "/usr/bin" Pathname.new "/usr/bin"
elsif not xctools_fucked?
# The new way of finding stuff via locate:
Pathname.new(locate 'make').dirname
elsif File.exist? "#{xcode_prefix}/usr/bin/make" elsif File.exist? "#{xcode_prefix}/usr/bin/make"
# cc stopped existing with Xcode 4.3, there are c89 and c99 options though # cc stopped existing with Xcode 4.3, there are c89 and c99 options though
Pathname.new "#{xcode_prefix}/usr/bin" Pathname.new "#{xcode_prefix}/usr/bin"