From 6b79a4e714f97fd35b690700d85a1a09041f09fb Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 30 Aug 2013 19:07:10 -0500 Subject: [PATCH] ENV: only set fortran flags in one place --- Library/Homebrew/extend/ENV/shared.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index ce5a56b61b..12fc7446ae 100644 --- a/Library/Homebrew/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/ENV/shared.rb @@ -120,15 +120,15 @@ module SharedEnvExtension end def fortran + flags = [] + if fc ohai "Building with an alternative Fortran compiler" puts "This is unsupported." self['F77'] ||= fc if ARGV.include? '--default-fortran-flags' - flags_to_set = FC_FLAG_VARS.reject { |key| self[key] } - flags_to_set.each {|key| self[key] = cflags} - set_cpu_flags(flags_to_set) + flags = FC_FLAG_VARS.reject { |key| self[key] } elsif values_at(*FC_FLAG_VARS).compact.empty? opoo <<-EOS.undent No Fortran optimization information was provided. You may want to consider @@ -144,9 +144,10 @@ module SharedEnvExtension ohai "Using Homebrew-provided fortran compiler." puts "This may be changed by setting the FC environment variable." self['FC'] = self['F77'] = gfortran - - FC_FLAG_VARS.each {|key| self[key] = cflags} - set_cpu_flags(FC_FLAG_VARS) + flags = FC_FLAG_VARS end + + flags.each { |key| self[key] = cflags } + set_cpu_flags(flags) end end