diff options
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index df5049757..c976d55a5 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -45,8 +45,8 @@ module Superenv def setup_build_environment(formula=nil) reset - self.cc = self['HOMEBREW_CC'] = determine_cc - self.cxx = self['HOMEBREW_CXX'] = determine_cxx + self.cc = determine_cc + self.cxx = determine_cxx validate_cc!(formula) unless formula.nil? self['MAKEFLAGS'] ||= "-j#{determine_make_jobs}" self['PATH'] = determine_path @@ -91,6 +91,14 @@ module Superenv private + def cc= val + self["HOMEBREW_CC"] = super + end + + def cxx= val + self["HOMEBREW_CXX"] = super + end + def determine_cc cc = compiler COMPILER_SYMBOL_MAP.invert.fetch(cc, cc) @@ -228,16 +236,16 @@ module Superenv COMPILER_SYMBOL_MAP.values.each do |compiler| define_method compiler do @compiler = compiler - self.cc = self['HOMEBREW_CC'] = determine_cc - self.cxx = self['HOMEBREW_CXX'] = determine_cxx + self.cc = determine_cc + self.cxx = determine_cxx end end GNU_GCC_VERSIONS.each do |n| define_method(:"gcc-4.#{n}") do @compiler = "gcc-4.#{n}" - self.cc = self['HOMEBREW_CC'] = determine_cc - self.cxx = self['HOMEBREW_CXX'] = determine_cxx + self.cc = determine_cc + self.cxx = determine_cxx end end |