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

ENV.rb: Generalize method for setting CPU flags

Browse Source 
All logic has been copied into a new method `set_cpu_flags` that accepts an
additional argument, `flags`, which contains a list of environment variables
for which the CPU flags are to be adjusted.

`set_cpu_cflags` now recalls `set_cpu_flags` and passes `cflags_flags` as the
first argument.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
This commit is contained in:
Charlie Sharpsteen 2012-03-07 18:33:32 -08:00
parent 1805e87529
commit 55d4f48746
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/Homebrew/extend/ENV.rb
View File

@ -355,24 +355,30 @@ Please take one of the following actions:
end end
end end
def set_cpu_cflags default, map = {} # Sets architecture-specific flags for every environment variable
# given in the list `flags`.
def set_cpu_flags flags, default, map = {}
cflags =~ %r{(-Xarch_i386 )-march=} cflags =~ %r{(-Xarch_i386 )-march=}
xarch = $1.to_s xarch = $1.to_s
remove_from_cflags %r{(-Xarch_i386 )?-march=\S*} remove flags, %r{(-Xarch_i386 )?-march=\S*}
remove_from_cflags %r{( -Xclang \S+)+} remove flags, %r{( -Xclang \S+)+}
remove_from_cflags %r{-mssse3} remove flags, %r{-mssse3}
remove_from_cflags %r{-msse4(\.\d)?} remove flags, %r{-msse4(\.\d)?}
append_to_cflags xarch unless xarch.empty? append flags, xarch unless xarch.empty?
if ARGV.build_bottle? if ARGV.build_bottle?
append_to_cflags '-mtune=' + map.fetch(:bottle) if map.has_key? :bottle append flags, '-mtune=' + map.fetch(:bottle) if map.has_key? :bottle
else else
# Don't set -msse3 and older flags because -march does that for us # Don't set -msse3 and older flags because -march does that for us
append_to_cflags '-march=' + map.fetch(Hardware.intel_family, default) append flags, '-march=' + map.fetch(Hardware.intel_family, default)
end end
# not really a 'CPU' cflag, but is only used with clang # not really a 'CPU' cflag, but is only used with clang
remove_from_cflags '-Qunused-arguments' remove flags, '-Qunused-arguments'
end
def set_cpu_cflags default, map = {}
set_cpu_flags cc_flag_vars, default, map
end end
# actually c-compiler, so cc would be a better name # actually c-compiler, so cc would be a better name