From 8e7fcaab1e050576519703ad6ad575a15414ce37 Mon Sep 17 00:00:00 2001 From: Misty De Meo Date: Mon, 7 Oct 2013 00:02:46 -0700 Subject: [PATCH] formula_installer: change default bottle CxxStdlib --- Library/Homebrew/formula_installer.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 8bc09475cd..4ac078d8df 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -149,13 +149,12 @@ class FormulaInstaller end if pour_bottle? - # TODO We currently only support building with libstdc++ as - # the default case, and all Apple libstdc++s are compatible, so - # this default is sensible. - # In the future we need to actually provide a way to read this from - # the bottle, or update the default should that change - # at some other point. - stdlib_in_use = CxxStdlib.new(:libstdcxx, :clang) + # 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.deps) end