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

ENV.fortran adds back superenv removed PATHs

Browse Source 
Fixes Homebrew/homebrew#15103.
This commit is contained in:
Max Howell 2012-09-25 12:04:42 -04:00
parent 382fa27520
commit b94e220bc3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,6 +446,10 @@ class << ENV
def fortran def fortran
fc_flag_vars = %w{FCFLAGS FFLAGS} fc_flag_vars = %w{FCFLAGS FFLAGS}
# superenv removes these PATHs, but this option needs them
# TODO fix better, probably by making a super-fc
ENV['PATH'] += ":#{HOMEBREW_PREFIX}/bin:/usr/local/bin"
if self['FC'] if self['FC']
ohai "Building with an alternative Fortran compiler. This is unsupported." ohai "Building with an alternative Fortran compiler. This is unsupported."
self['F77'] = self['FC'] unless self['F77'] self['F77'] = self['FC'] unless self['F77']
@ -470,7 +474,7 @@ class << ENV
EOS EOS
end end
elsif `/usr/bin/which gfortran`.chomp.size > 0 elsif `/usr/bin/which gfortran`.chuzzle
ohai <<-EOS.undent ohai <<-EOS.undent
Using Homebrew-provided fortran compiler. Using Homebrew-provided fortran compiler.
This may be changed by setting the FC environment variable. This may be changed by setting the FC environment variable.