Simplify handling custom FCFLAGS

This commit is contained in:
Jack Nagel 2013-08-30 16:40:45 -05:00
parent 43bd5d44c2
commit 4bee5db66d

View File

@ -118,9 +118,7 @@ module SharedEnvExtension
self['F77'] ||= self['FC'] self['F77'] ||= self['FC']
if ARGV.include? '--default-fortran-flags' if ARGV.include? '--default-fortran-flags'
flags_to_set = [] flags_to_set = FC_FLAG_VARS.reject { |key| self[key] }
flags_to_set << 'FCFLAGS' unless self['FCFLAGS']
flags_to_set << 'FFLAGS' unless self['FFLAGS']
flags_to_set.each {|key| self[key] = cflags} flags_to_set.each {|key| self[key] = cflags}
set_cpu_flags(flags_to_set) set_cpu_flags(flags_to_set)
elsif not self['FCFLAGS'] or self['FFLAGS'] elsif not self['FCFLAGS'] or self['FFLAGS']