From 63d17d8e43322990ed9541b88ddaa8133d750dd9 Mon Sep 17 00:00:00 2001
From: Eric Bohm <ebohm@illinois.edu>
Date: Tue, 18 Mar 2014 15:43:09 -0500
Subject: [PATCH] bugfix for fortran compiler detection and setup now matches
 what we do in netlrts

Change-Id: I5cb54cb4270ccaf6fd4062329e917523dd58e17e
---
 src/arch/multicore-linux64/conv-mach.sh | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/arch/multicore-linux64/conv-mach.sh b/src/arch/multicore-linux64/conv-mach.sh
index 0d7a8ec1f6..c9765d8053 100644
--- a/src/arch/multicore-linux64/conv-mach.sh
+++ b/src/arch/multicore-linux64/conv-mach.sh
@@ -26,13 +26,16 @@ CMK_SEQ_CXX="$CMK_NATIVE_CXX"
 CMK_SEQ_LD="$CMK_NATIVE_LD"
 CMK_SEQ_LDXX="$CMK_NATIVE_LDXX"
 
-CMK_CF77="g77 "
-CMK_CF90="f90 "
-CMK_CF90_FIXED="$CMK_CF90 -W132 "
-CMK_F90LIBS="-L/usr/absoft/lib -L/opt/absoft/lib -lf90math -lfio -lU77 -lf77math "
-CMK_F77LIBS="-lg2c "
-CMK_F90_USE_MODDIR=1
-CMK_F90_MODINC="-p"
-
-CMK_QT='generic64'
-
+CMK_CF90=`which f95 2>/dev/null`
+if test -n "$CMK_CF90"
+then
+    . $CHARMINC/conv-mach-gfortran.sh
+else
+    CMK_CF77="g77 "
+    CMK_CF90="f90 "
+    CMK_CF90_FIXED="$CMK_CF90 -W132 "
+    CMK_F90LIBS="-lf90math -lfio -lU77 -lf77math "
+    CMK_F77LIBS="-lg2c "
+    CMK_F90_USE_MODDIR=1
+    CMK_F90_MODINC="-p"
+fi
-- 
2.11.4.GIT