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

Make cc=/cxx= set HOMEBREW_CC in superenv

Browse Source
This commit is contained in:
Jack Nagel 2014-05-13 16:09:19 -05:00
parent a04a6a399a
commit 2716ed6d26
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/extend/ENV/super.rb
View File

@ -45,8 +45,8 @@ module Superenv
def setup_build_environment(formula=nil) def setup_build_environment(formula=nil)
reset reset
self.cc = self['HOMEBREW_CC'] = determine_cc self.cc = determine_cc
self.cxx = self['HOMEBREW_CXX'] = determine_cxx self.cxx = determine_cxx
validate_cc!(formula) unless formula.nil? validate_cc!(formula) unless formula.nil?
self['MAKEFLAGS'] ||= "-j#{determine_make_jobs}" self['MAKEFLAGS'] ||= "-j#{determine_make_jobs}"
self['PATH'] = determine_path self['PATH'] = determine_path
@ -91,6 +91,14 @@ module Superenv
private private
def cc= val
self["HOMEBREW_CC"] = super
end
def cxx= val
self["HOMEBREW_CXX"] = super
end
def determine_cc def determine_cc
cc = compiler cc = compiler
COMPILER_SYMBOL_MAP.invert.fetch(cc, cc) COMPILER_SYMBOL_MAP.invert.fetch(cc, cc)
@ -228,16 +236,16 @@ module Superenv
COMPILER_SYMBOL_MAP.values.each do |compiler| COMPILER_SYMBOL_MAP.values.each do |compiler|
define_method compiler do define_method compiler do
@compiler = compiler @compiler = compiler
self.cc = self['HOMEBREW_CC'] = determine_cc self.cc = determine_cc
self.cxx = self['HOMEBREW_CXX'] = determine_cxx self.cxx = determine_cxx
end end
end end
GNU_GCC_VERSIONS.each do |n| GNU_GCC_VERSIONS.each do |n|
define_method(:"gcc-4.#{n}") do define_method(:"gcc-4.#{n}") do
@compiler = "gcc-4.#{n}" @compiler = "gcc-4.#{n}"
self.cc = self['HOMEBREW_CC'] = determine_cc self.cc = determine_cc
self.cxx = self['HOMEBREW_CXX'] = determine_cxx self.cxx = determine_cxx
end end
end end