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

Remove PATH hack from ENV.fortran

Browse Source
This commit is contained in:
Jack Nagel 2013-08-30 16:27:31 -05:00
parent dbce25783c
commit 43bd5d44c2
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,10 +112,6 @@ module SharedEnvExtension
end end
def fortran def fortran
# superenv removes these PATHs, but this option needs them
# TODO fix better, probably by making a super-fc
self['PATH'] += ":#{HOMEBREW_PREFIX}/bin:/usr/local/bin"
if self['FC'] if self['FC']
ohai "Building with an alternative Fortran compiler" ohai "Building with an alternative Fortran compiler"
puts "This is unsupported." puts "This is unsupported."
@ -138,11 +134,10 @@ module SharedEnvExtension
EOS EOS
end end
elsif which 'gfortran' elsif (gfortran = which('gfortran', ORIGINAL_PATHS.join(File::PATH_SEPARATOR)))
ohai "Using Homebrew-provided fortran compiler." ohai "Using Homebrew-provided fortran compiler."
puts "This may be changed by setting the FC environment variable." puts "This may be changed by setting the FC environment variable."
self['FC'] = which 'gfortran' self['FC'] = self['F77'] = gfortran
self['F77'] = self['FC']
FC_FLAG_VARS.each {|key| self[key] = cflags} FC_FLAG_VARS.each {|key| self[key] = cflags}
set_cpu_flags(FC_FLAG_VARS) set_cpu_flags(FC_FLAG_VARS)