Fix set_cpu_flags invocations in ENV.fortran

Fixes Homebrew/homebrew#19013.
Fixes Homebrew/homebrew#19862.
Fixes Homebrew/homebrew#19921.
This commit is contained in:
Jack Nagel 2013-05-19 11:18:51 -05:00
parent 40dedcec70
commit 4276d03fe4

View File

@ -468,7 +468,7 @@ class << ENV
flags_to_set.each {|key| self[key] = cflags} flags_to_set.each {|key| self[key] = cflags}
# Ensure we use architecture optimizations for GCC 4.2.x # Ensure we use architecture optimizations for GCC 4.2.x
set_cpu_flags flags_to_set, 'core2 -msse4', set_cpu_flags flags_to_set, '-march=core2 -msse4',
Hardware::CPU.optimization_flags Hardware::CPU.optimization_flags
elsif not self['FCFLAGS'] or self['FFLAGS'] elsif not self['FCFLAGS'] or self['FFLAGS']
opoo <<-EOS.undent opoo <<-EOS.undent
@ -489,7 +489,7 @@ class << ENV
fc_flag_vars.each {|key| self[key] = cflags} fc_flag_vars.each {|key| self[key] = cflags}
# Ensure we use architecture optimizations for GCC 4.2.x # Ensure we use architecture optimizations for GCC 4.2.x
set_cpu_flags fc_flag_vars, 'core2 -msse4', set_cpu_flags fc_flag_vars, '-march=core2 -msse4',
Hardware::CPU.optimization_flags Hardware::CPU.optimization_flags
else else