[svn-r26631] reverted change r26629

This commit is contained in:
Scot Breitenfeld
2015-03-27 17:16:49 -05:00
parent d494d7b3b9
commit ff1c86df14
6 changed files with 16 additions and 184 deletions

View File

@@ -38,9 +38,6 @@ fi
# Figure out PGI C compiler flags
. $srcdir/config/pgi-flags
# Figure out CCE C compiler flags
. $srcdir/config/cce-flags
# Figure out Intel C compiler flags
. $srcdir/config/intel-flags
@@ -92,13 +89,10 @@ else
esac
fi
# Figure out PGI FC compiler flags
# Figure out PGI F90 compiler flags
. $srcdir/config/pgi-fflags
# Figure out CCE FC compiler flags
. $srcdir/config/cce-fflags
# Figure out Intel FC compiler flags
# Figure out Intel F90 compiler flags
. $srcdir/config/intel-fflags
case $FC_BASENAME in
@@ -131,10 +125,6 @@ if test -z "$CXX"; then
fi
# compiler version strings
# check if the compiler_version_info is already set
if test -z "$cc_version_info"; then
case $CC in
# whatever matches *pgcc* will also match *gcc*, so this one must come first
*pgcc*)
@@ -163,11 +153,7 @@ case $CC in
;;
esac
fi
# get fortran version info
# check if the compiler_version_info is already set
if test -z "$fc_version_info"; then
case $FC in
*gfortran*)
fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\
@@ -213,11 +199,9 @@ case $FC in
echo "No match to get fc_version_info for $FC"
;;
esac
fi
# get c++ version info
# check if the compiler_version_info is already set
if test -z "$cxx_version_info"; then
case $CXX in
*g++*)
cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\
@@ -242,4 +226,4 @@ case $CXX in
echo "No match to get cxx_version_info for $CXX"
;;
esac
fi