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

Move bottle stdlib tracking post-pour

Browse Source 
This allows us to track the actual stdlib in use, and prevents warnings
for bottles with no C++ code.
This commit is contained in:
Misty De Meo 2013-10-23 22:25:02 -07:00
parent 3657393017
commit 2775a4b12c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/formula_installer.rb
View File

@ -179,16 +179,6 @@ class FormulaInstaller
raise "Unrecognized architecture for --bottle-arch: #{arch}" raise "Unrecognized architecture for --bottle-arch: #{arch}"
end end
if pour_bottle?
# This assumes that bottles are built with
# a) the OS's default compiler, and
# b) the OS's default C++ stdlib
# This is probably accurate, but could possibly stand to be
# more robust.
stdlib_in_use = CxxStdlib.new(MacOS.default_cxx_stdlib, MacOS.default_compiler)
stdlib_in_use.check_dependencies(f, f.recursive_dependencies)
end
oh1 "Installing #{Tty.green}#{f}#{Tty.reset}" if show_header oh1 "Installing #{Tty.green}#{f}#{Tty.reset}" if show_header
@@attempted << f @@attempted << f
@ -201,6 +191,11 @@ class FormulaInstaller
if pour_bottle? :warn => true if pour_bottle? :warn => true
pour pour
@poured_bottle = true @poured_bottle = true
stdlibs = Keg.new(f.prefix).detect_cxx_stdlibs
stdlib_in_use = CxxStdlib.new(stdlibs.first, MacOS.default_compiler)
stdlib_in_use.check_dependencies(f, f.recursive_dependencies)
tab = Tab.for_keg f.prefix tab = Tab.for_keg f.prefix
tab.poured_from_bottle = true tab.poured_from_bottle = true
tab.tabfile.delete if tab.tabfile tab.tabfile.delete if tab.tabfile