Merge branch 'charm' of charmgit:charm into charm
authorGengbin Zheng <gzheng@illinois.edu>
Fri, 2 Dec 2011 21:49:59 +0000 (15:49 -0600)
committerGengbin Zheng <gzheng@illinois.edu>
Fri, 2 Dec 2011 21:49:59 +0000 (15:49 -0600)
src/arch/common/conv-mach-gfortran.sh

index 9bc52d5a26717d6ac2003493c6410545492f3d37..bf3cc2c8293cde0d65a9c8c0351a9f17177fbc5b 100644 (file)
@@ -40,7 +40,7 @@ else
   f95target=`gfortran -v 2>&1 | grep Target | cut -f2 -d' '`
   f95version=`gfortran -v 2>&1 | grep 'gcc version' | cut -d' ' -f3`
   F90LIBDIR=`cd $F90DIR/../lib/gcc/$f95target/$f95version/ 2>/dev/null && pwd`
-  test -n "$F90LIBDIR" && F90LIBDIR=`cd $F90DIR/../lib/$f95target/gcc/$f95version/ 2>/dev/null && pwd`
+  test -z "$F90LIBDIR" && F90LIBDIR=`cd $F90DIR/../lib/$f95target/gcc/$f95version/ 2>/dev/null && pwd`
   #F90LIBDIR=`cd $F90DIR/../lib/gcc/ia64-unknown-linux-gnu/4.1.0; pwd`
 fi
 test -n "$F90LIBDIR" && CMK_F90LIBS="-L$F90LIBDIR -lgfortran -lgcc_eh"