summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2013-02-08 00:09:24 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2013-02-08 00:09:24 (GMT)
commit69a777556e61928537648bcd46ae16069c042547 (patch)
tree260f8260e9aea24f8031bdc1b1c98e5da6710f7a
parent400bf73d17c5a7c9a4917b97669cbdea916dce76 (diff)
downloadhdf5-69a777556e61928537648bcd46ae16069c042547.zip
hdf5-69a777556e61928537648bcd46ae16069c042547.tar.gz
hdf5-69a777556e61928537648bcd46ae16069c042547.tar.bz2
[svn-r23235] Fix for:
HDFFV-7909 When building with g95 on Mac OS X 64-bit, the wrong options (gfortran) are used Tested: duck (gfortran, g95 (which is not supported))
-rw-r--r--config/apple10
1 files 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