summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2009-07-28 00:28:24 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2009-07-28 00:28:24 (GMT)
commit7c4b1edcdbd40c17538153e436b5dbd23bb42f98 (patch)
treee153526aeff23bdfd2271633d99ed1d989c0f16a
parent6909bc431912fc10b0605059e6d6eed44c9378ae (diff)
downloadhdf5-7c4b1edcdbd40c17538153e436b5dbd23bb42f98.zip
hdf5-7c4b1edcdbd40c17538153e436b5dbd23bb42f98.tar.gz
hdf5-7c4b1edcdbd40c17538153e436b5dbd23bb42f98.tar.bz2
[svn-r17248] Bug fix (1301 & 1468)
PathScale was mistaken as the Gcc compiler such that gcc flags were added to it but PathScale did not honor many of them. (e.g. -Wvariadic-macros, -Wold-style-definition, -Winit-self, -Wvariadic-macros, -Wmissing-include-dirs, -Winit-self, -Wc++-compat) Solution: Added a pre-condition to detect pathScale compiler before Gcc is accepted. Tested: Sandia Glory where PathScale compiler is available.
-rw-r--r--config/gnu-flags6
1 files changed, 4 insertions, 2 deletions
diff --git a/config/gnu-flags b/config/gnu-flags
index fe3eba3..c1990e0 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -26,8 +26,10 @@
# cc_version: Version number: 2.91.60, 2.7.2.1
#
if test X = "X$cc_flags_set"; then
- cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 |grep 'gcc version' |\
- sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
+ # PathScale compiler spits out gcc version string too. Need to
+ # filter it out.
+ cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 | grep -v 'PathScale' |\
+ grep 'gcc version' | sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
cc_version=`echo $cc_version |sed 's/[-a-z]//g'`
if test X = "X$cc_vendor" -a X != "X$cc_version"; then