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

Correctly find Homebrew-installed fortran

Browse Source 
Fixes Homebrew/homebrew#26338.
Closes Homebrew/homebrew#26352.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Camillo Lugaresi 2014-02-02 12:57:46 -06:00 committed by Jack Nagel
parent d885d98164
commit cbd14fde1e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/extend/ENV/shared.rb
View File

@ -161,12 +161,18 @@ module SharedEnvExtension
EOS EOS
end end
elsif (gfortran = which('gfortran', ORIGINAL_PATHS.join(File::PATH_SEPARATOR))) else
if (gfortran = which('gfortran', (HOMEBREW_PREFIX/'bin').to_s))
ohai "Using Homebrew-provided fortran compiler." ohai "Using Homebrew-provided fortran compiler."
elsif (gfortran = which('gfortran', ORIGINAL_PATHS.join(File::PATH_SEPARATOR)))
ohai "Using a fortran compiler found at #{gfortran}."
end
if gfortran
puts "This may be changed by setting the FC environment variable." puts "This may be changed by setting the FC environment variable."
self['FC'] = self['F77'] = gfortran self['FC'] = self['F77'] = gfortran
flags = FC_FLAG_VARS flags = FC_FLAG_VARS
end end
end
flags.each { |key| self[key] = cflags } flags.each { |key| self[key] = cflags }
set_cpu_flags(flags) set_cpu_flags(flags)