diff options
| author | Max Howell | 2012-09-25 12:04:42 -0400 |
|---|---|---|
| committer | Max Howell | 2012-09-25 12:04:42 -0400 |
| commit | b94e220bc3d5ac7f2509ee18814e1333a120f784 (patch) | |
| tree | 4521f3a7e5d7753158140772d6a7d926ce53885b /Library/Homebrew/extend | |
| parent | 382fa275201da72bfe7c6c4539ab56b3de0a1010 (diff) | |
| download | brew-b94e220bc3d5ac7f2509ee18814e1333a120f784.tar.bz2 | |
ENV.fortran adds back superenv removed PATHs
Fixes Homebrew/homebrew#15103.
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ENV.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 2c0108548..70e000e0a 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -446,6 +446,10 @@ class << ENV def fortran 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'] ohai "Building with an alternative Fortran compiler. This is unsupported." self['F77'] = self['FC'] unless self['F77'] @@ -470,7 +474,7 @@ class << ENV EOS end - elsif `/usr/bin/which gfortran`.chomp.size > 0 + elsif `/usr/bin/which gfortran`.chuzzle ohai <<-EOS.undent Using Homebrew-provided fortran compiler. This may be changed by setting the FC environment variable. |