diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2004-12-03 18:08:20 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-12-03 18:08:20 (GMT) |
| commit | aaa9290be192523fc50b2623930b9b5a026b60ab (patch) | |
| tree | be5c3c8e3f3e5e32ff95df7c7f7c1d30e90f4680 | |
| parent | 266613d5963e5df915d1ee426aab14ca2d17c3f3 (diff) | |
| download | hdf5-aaa9290be192523fc50b2623930b9b5a026b60ab.zip hdf5-aaa9290be192523fc50b2623930b9b5a026b60ab.tar.gz hdf5-aaa9290be192523fc50b2623930b9b5a026b60ab.tar.bz2 | |
[svn-r9612] Purpose:
Bug fix
Description:
Correct typo in ia64 configure script.
Update intel compiler detection to handle Itanium versions of compilers
Platforms tested:
Teragrid machine (tg-login) w/icc 7.1 & 8.x
Linux 2.4 (verbena) w/icc
| -rw-r--r-- | config/ia64-linux-gnu | 9 | ||||
| -rw-r--r-- | config/intel-flags | 2 | ||||
| -rw-r--r-- | fortran/config/ia64-linux-gnu | 10 | ||||
| -rw-r--r-- | fortran/config/intel-flags | 2 |
4 files changed, 4 insertions, 19 deletions
diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu index e0941df..b212670 100644 --- a/config/ia64-linux-gnu +++ b/config/ia64-linux-gnu @@ -21,14 +21,7 @@ fi case $CC_BASENAME in ecc|icc) - # Default to C99 standard. - CFLAGS="${CFLAGS:--std=c99}" - DEBUG_CFLAGS="-w2 -Wall -g -O0" - DEBUG_CPPFLAGS= - PROD_CFLAGS="" # ecc has -O2 as default - PROD_CPPFLAGS= - PROFILE_CFLAGS="-p" - PROFILE_CPPFLAGS= + . $srcdir/config/intel-flags ;; gcc) diff --git a/config/intel-flags b/config/intel-flags index 34eca87..3f43132 100644 --- a/config/intel-flags +++ b/config/intel-flags @@ -12,7 +12,7 @@ # cc_version: Version number: 8.0 # if test X = "X$cc_flags_set"; then - cc_version="`$CC $CFLAGS -V 2>&1 |grep '^Intel'`" + cc_version="`$CC $CFLAGS -V 2>&1 |grep 'Version'`" if test X != "X$cc_version"; then cc_vendor=icc cc_version=`echo $cc_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'` diff --git a/fortran/config/ia64-linux-gnu b/fortran/config/ia64-linux-gnu index 7f0da2c..94a6824 100644 --- a/fortran/config/ia64-linux-gnu +++ b/fortran/config/ia64-linux-gnu @@ -20,15 +20,7 @@ fi case $CC_BASENAME in ecc|icc) - # CFLAGS must be set else configure set it to -g - CFLAGS="$CFLAGS" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - # ecc has -O2 as default - PROD_CFLAGS="" - PROD_CPPFLAGS= - PROFILE_CFLAGS="" # ecc has no profile option - PROFILE_CPPFLAGS= + . $srcdir/config/intel-flags ;; gcc) diff --git a/fortran/config/intel-flags b/fortran/config/intel-flags index 9e9a5e8..99b2537 100644 --- a/fortran/config/intel-flags +++ b/fortran/config/intel-flags @@ -12,7 +12,7 @@ # cc_version: Version number: 8.0 # if test X = "X$cc_flags_set"; then - cc_version="`$CC $CFLAGS -V 2>&1 |grep '^Intel'`" + cc_version="`$CC $CFLAGS -V 2>&1 |grep 'Version'`" if test X != "X$cc_version"; then cc_vendor=icc cc_version=`echo $cc_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'` |