Stdlib check should use the compiler used to build the bottle
This commit is contained in:
parent
0f745872df
commit
7690a00d04
@ -626,12 +626,13 @@ class FormulaInstaller
|
||||
end
|
||||
FileUtils.rm_rf formula.bottle_prefix
|
||||
|
||||
tab = Tab.for_keg(formula.prefix)
|
||||
|
||||
CxxStdlib.check_compatibility(
|
||||
formula, formula.recursive_dependencies,
|
||||
Keg.new(formula.prefix), MacOS.default_compiler
|
||||
Keg.new(formula.prefix), tab.compiler
|
||||
)
|
||||
|
||||
tab = Tab.for_keg(formula.prefix)
|
||||
tab.tap = formula.tap
|
||||
tab.poured_from_bottle = true
|
||||
tab.write
|
||||
|
@ -155,11 +155,14 @@ class Tab < OpenStruct
|
||||
Options.create(super)
|
||||
end
|
||||
|
||||
def compiler
|
||||
super || MacOS.default_compiler
|
||||
end
|
||||
|
||||
def cxxstdlib
|
||||
# Older tabs won't have these values, so provide sensible defaults
|
||||
lib = stdlib.to_sym if stdlib
|
||||
cc = compiler || MacOS.default_compiler
|
||||
CxxStdlib.create(lib, cc.to_sym)
|
||||
CxxStdlib.create(lib, compiler.to_sym)
|
||||
end
|
||||
|
||||
def build_bottle?
|
||||
|
Loading…
x
Reference in New Issue
Block a user