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

Allow changing the optimization level under superenv

Browse Source
This commit is contained in:
Jack Nagel 2013-11-12 12:00:18 -06:00
parent c7b7fdf0ca
commit 4cb824b92e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/ENV/4.3/cc
View File

@ -181,7 +181,7 @@ class Cmd
end end
def optflags def optflags
args = [] args = []
args << '-Os' args << "-#{ENV['HOMEBREW_OPTIMIZATION_LEVEL']}"
# When bottling use the oldest supported CPU type. # When bottling use the oldest supported CPU type.
if cccfg? 'bc' if cccfg? 'bc'

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

@ -70,6 +70,7 @@ module Superenv
self['PKG_CONFIG_PATH'] = determine_pkg_config_path self['PKG_CONFIG_PATH'] = determine_pkg_config_path
self['PKG_CONFIG_LIBDIR'] = determine_pkg_config_libdir self['PKG_CONFIG_LIBDIR'] = determine_pkg_config_libdir
self['HOMEBREW_CCCFG'] = determine_cccfg self['HOMEBREW_CCCFG'] = determine_cccfg
self['HOMEBREW_OPTIMIZATION_LEVEL'] = 'Os'
self['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE self['HOMEBREW_BREW_FILE'] = HOMEBREW_BREW_FILE
self['HOMEBREW_SDKROOT'] = "#{MacOS.sdk_path}" if MacOS::Xcode.without_clt? self['HOMEBREW_SDKROOT'] = "#{MacOS.sdk_path}" if MacOS::Xcode.without_clt?
self['HOMEBREW_DEVELOPER_DIR'] = determine_developer_dir # used by our xcrun shim self['HOMEBREW_DEVELOPER_DIR'] = determine_developer_dir # used by our xcrun shim
@ -252,7 +253,7 @@ module Superenv
### NO LONGER NECESSARY OR NO LONGER SUPPORTED ### NO LONGER NECESSARY OR NO LONGER SUPPORTED
def noop(*args); end def noop(*args); end
%w[m64 gcc_4_0_1 fast O4 O3 O2 Os Og O1 libxml2 minimal_optimization %w[m64 gcc_4_0_1 fast Og libxml2 minimal_optimization
no_optimization enable_warnings x11 no_optimization enable_warnings x11
set_cpu_flags set_cpu_flags
macosxsdk remove_macosxsdk].each{|s| alias_method s, :noop } macosxsdk remove_macosxsdk].each{|s| alias_method s, :noop }
@ -315,6 +316,12 @@ module Superenv
def m32 def m32
append 'HOMEBREW_CCCFG', "3", '' append 'HOMEBREW_CCCFG', "3", ''
end end
%w{O4 O3 O2 O1 O0 Os}.each do |opt|
define_method opt do
self['HOMEBREW_OPTIMIZATION_LEVEL'] = opt
end
end
end end