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

ENV.rb: Set GCC-style CPU flags for GFortran

Browse Source 
GFortran chokes when it is passed CPU flags specific to Clang. This change
ensures the environment variables `FCFLAGS` and `FFLAGS` contain the same CPU
flags that would be set for the GCC compiler.

Fixes Homebrew/homebrew#10424.
Fixes Homebrew/homebrew#10744.

Closes Homebrew/homebrew#10774.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
This commit is contained in:
Charlie Sharpsteen 2012-03-07 18:38:04 -08:00
parent 55d4f48746
commit 275d22db9e
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,8 +176,14 @@ module HomebrewEnvExtension
self['F77'] = self['FC'] unless self['F77'] self['F77'] = self['FC'] unless self['F77']
if ARGV.include? '--default-fortran-flags' if ARGV.include? '--default-fortran-flags'
self['FCFLAGS'] = self['CFLAGS'] unless self['FCFLAGS'] flags_to_set = []
self['FFLAGS'] = self['CFLAGS'] unless self['FFLAGS'] flags_to_set << 'FCFLAGS' unless self['FCFLAGS']
flags_to_set << 'FFLAGS' unless self['FFLAGS']
flags_to_set.each {|key| self[key] = cflags}
# Ensure we use architecture optimizations for GCC 4.2.x
set_cpu_flags flags_to_set, 'core2 -msse4', :penryn => 'core2 -msse4.1', :core2 => 'core2', :core => 'prescott', :bottle => 'generic'
elsif not self['FCFLAGS'] or self['FFLAGS'] elsif not self['FCFLAGS'] or self['FFLAGS']
opoo <<-EOS.undent opoo <<-EOS.undent
No Fortran optimization information was provided. You may want to consider No Fortran optimization information was provided. You may want to consider
@ -197,8 +203,9 @@ module HomebrewEnvExtension
self['FC'] = `/usr/bin/which gfortran`.chomp self['FC'] = `/usr/bin/which gfortran`.chomp
self['F77'] = self['FC'] self['F77'] = self['FC']
self['FCFLAGS'] = self['CFLAGS'] fc_flag_vars.each {|key| self[key] = cflags}
self['FFLAGS'] = self['CFLAGS'] # Ensure we use architecture optimizations for GCC 4.2.x
set_cpu_flags fc_flag_vars, 'core2 -msse4', :penryn => 'core2 -msse4.1', :core2 => 'core2', :core => 'prescott', :bottle => 'generic'
else else
onoe <<-EOS onoe <<-EOS
@ -278,6 +285,9 @@ Please take one of the following actions:
def cc_flag_vars def cc_flag_vars
%w{CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS} %w{CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS}
end end
def fc_flag_vars
%w{FCFLAGS FFLAGS}
end
def m64 def m64
append_to_cflags '-m64' append_to_cflags '-m64'