From 8dcb0ee3d069b03c1146086dc186fc135ae83bf2 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Tue, 12 Feb 2013 19:04:15 -0500 Subject: [svn-r23261] Brought r23235 from trunk into branch. --- config/apple | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/config/apple b/config/apple index 34085e0..c5c0a19 100644 --- a/config/apple +++ b/config/apple @@ -58,10 +58,6 @@ if test "X-" = "X-$FC"; then ;; esac fi -# Figure out compiler flags -. $srcdir/config/gnu-fflags - -. $srcdir/config/intel-fflags # compiler version strings case $CC in @@ -79,20 +75,22 @@ case $CC in echo "No match to get cc_version_info for $CC" ;; esac - +# Figure out Fortran compiler flags and version strings case $FC in *gfortran*) + . $srcdir/config/gnu-fflags fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\ grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'` ;; *ifc*|*ifort*) + . $srcdir/config/intel-fflags fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\ sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'` ;; *) - echo "No match to get fc_version_info for $FC" + echo "No match to get fc_version_info and flags for $FC" ;; esac -- cgit v0.12