aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorCamillo Lugaresi2014-02-02 12:57:46 -0600
committerJack Nagel2014-02-02 14:13:53 -0500
commitcbd14fde1e7392424decea54f0d8caf16df01260 (patch)
tree0c9737d5e509330a0dd1c23fdd4aa56d1dfd8e8d /Library/Homebrew/extend
parentd885d981644c080409f8018b661015029f3552a0 (diff)
downloadbrew-cbd14fde1e7392424decea54f0d8caf16df01260.tar.bz2
Correctly find Homebrew-installed fortran
Fixes Homebrew/homebrew#26338. Closes Homebrew/homebrew#26352. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ENV/shared.rb16
1 files changed, 11 insertions, 5 deletions
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index f26fdb4ab..fec709ffb 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -161,11 +161,17 @@ module SharedEnvExtension
EOS
end
- elsif (gfortran = which('gfortran', ORIGINAL_PATHS.join(File::PATH_SEPARATOR)))
- ohai "Using Homebrew-provided fortran compiler."
- puts "This may be changed by setting the FC environment variable."
- self['FC'] = self['F77'] = gfortran
- flags = FC_FLAG_VARS
+ else
+ if (gfortran = which('gfortran', (HOMEBREW_PREFIX/'bin').to_s))
+ 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."
+ self['FC'] = self['F77'] = gfortran
+ flags = FC_FLAG_VARS
+ end
end
flags.each { |key| self[key] = cflags }