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

Group public ENV methods together

Browse Source
This commit is contained in:
Jack Nagel 2013-11-11 18:33:47 -06:00
parent c95c32fbb0
commit 83cbb1e3fb
1 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,39 +111,6 @@ module Superenv
warn_about_non_apple_gcc($1) if ENV['HOMEBREW_CC'] =~ GNU_GCC_REGEXP warn_about_non_apple_gcc($1) if ENV['HOMEBREW_CC'] =~ GNU_GCC_REGEXP
end end
def universal_binary
self['HOMEBREW_ARCHS'] = Hardware::CPU.universal_archs.join(',')
append 'HOMEBREW_CCCFG', "u", ''
end
def cxx11
if self['HOMEBREW_CC'] == 'clang'
append 'HOMEBREW_CCCFG', "x", ''
append 'HOMEBREW_CCCFG', "g", ''
elsif self['HOMEBREW_CC'] =~ /gcc-4\.(8|9)/
append 'HOMEBREW_CCCFG', "x", ''
else
raise "The selected compiler doesn't support C++11: #{self['HOMEBREW_CC']}"
end
end
def libcxx
if self['HOMEBREW_CC'] == 'clang'
append 'HOMEBREW_CCCFG', "g", ''
end
end
def libstdcxx
if self['HOMEBREW_CC'] == 'clang'
append 'HOMEBREW_CCCFG', "h", ''
end
end
# m32 on superenv does not add any CC flags. It prevents "-m32" from being erased.
def m32
append 'HOMEBREW_CCCFG', "3", ''
end
private private
def determine_cc def determine_cc
@ -294,6 +261,7 @@ module Superenv
delete('MAKEFLAGS') delete('MAKEFLAGS')
end end
alias_method :j1, :deparallelize alias_method :j1, :deparallelize
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
@ -301,6 +269,7 @@ module Superenv
self.cxx = self['HOMEBREW_CXX'] = determine_cxx self.cxx = self['HOMEBREW_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}"
@ -308,10 +277,44 @@ module Superenv
self.cxx = self['HOMEBREW_CXX'] = determine_cxx self.cxx = self['HOMEBREW_CXX'] = determine_cxx
end end
end end
def make_jobs def make_jobs
self['MAKEFLAGS'] =~ /-\w*j(\d)+/ self['MAKEFLAGS'] =~ /-\w*j(\d)+/
[$1.to_i, 1].max [$1.to_i, 1].max
end end
def universal_binary
self['HOMEBREW_ARCHS'] = Hardware::CPU.universal_archs.join(',')
append 'HOMEBREW_CCCFG', "u", ''
end
def cxx11
if self['HOMEBREW_CC'] == 'clang'
append 'HOMEBREW_CCCFG', "x", ''
append 'HOMEBREW_CCCFG', "g", ''
elsif self['HOMEBREW_CC'] =~ /gcc-4\.(8|9)/
append 'HOMEBREW_CCCFG', "x", ''
else
raise "The selected compiler doesn't support C++11: #{self['HOMEBREW_CC']}"
end
end
def libcxx
if self['HOMEBREW_CC'] == 'clang'
append 'HOMEBREW_CCCFG', "g", ''
end
end
def libstdcxx
if self['HOMEBREW_CC'] == 'clang'
append 'HOMEBREW_CCCFG', "h", ''
end
end
# m32 on superenv does not add any CC flags. It prevents "-m32" from being erased.
def m32
append 'HOMEBREW_CCCFG', "3", ''
end
end end