From b94e220bc3d5ac7f2509ee18814e1333a120f784 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Tue, 25 Sep 2012 12:04:42 -0400 Subject: [PATCH] ENV.fortran adds back superenv removed PATHs Fixes Homebrew/homebrew#15103. --- Library/Homebrew/extend/ENV.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 2c0108548f..70e000e0a6 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.