summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2004-12-07 14:55:45 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2004-12-07 14:55:45 (GMT)
commit4da1a7de065f3c7885bc8dd0697decfbae38f0da (patch)
tree6362327fa482fdad090fd9e3efb4e11a6119e66e
parent81acec07595414567a2731e4ec66deed4964e598 (diff)
downloadhdf5-4da1a7de065f3c7885bc8dd0697decfbae38f0da.zip
hdf5-4da1a7de065f3c7885bc8dd0697decfbae38f0da.tar.gz
hdf5-4da1a7de065f3c7885bc8dd0697decfbae38f0da.tar.bz2
[svn-r9626] Purpose:
Code cleanup Description: Clean/fix up compiler flags to be more consistent after recent changes. Platforms tested: None - eyeballed - very minor
-rw-r--r--config/intel-flags8
-rw-r--r--fortran/config/intel-flags15
2 files changed, 14 insertions, 9 deletions
diff --git a/config/intel-flags b/config/intel-flags
index 5c76bfe..f5021d9 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -54,7 +54,7 @@ if test "X-icc" = "X-$cc_vendor"; then
# General
# Default to C99 standard.
- CFLAGS="${CFLAGS:--std=c99}"
+ CFLAGS="${CFLAGS:--std=c99} $arch"
# Production
PROD_CFLAGS="-O3"
@@ -83,12 +83,6 @@ case "$cc_vendor-$cc_version" in
# v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2.
PROD_CFLAGS="-O2"
;;
- icc-8.1*)
- # Add C99 standard flag to enable definition of ULLONG_MAX because in Intel
- # compiler header file limits.h, C99 has to be enable to define this macro.
- # Compilers of Version 8 and before don't have this problem.
- CFLAGS="$CFLAGS -std=c99"
- ;;
esac
# Clear cc info if no flags set
diff --git a/fortran/config/intel-flags b/fortran/config/intel-flags
index 99b2537..e3e28f3 100644
--- a/fortran/config/intel-flags
+++ b/fortran/config/intel-flags
@@ -53,14 +53,14 @@ if test "X-icc" = "X-$cc_vendor"; then
#esac
# General
- CFLAGS="$CFLAGS $arch -Wall -Wcheck"
+ CFLAGS="${CFLAGS:--std=c99} $arch"
# Production
PROD_CFLAGS="-O3"
PROD_CPPFLAGS=
# Debug
- DEBUG_CFLAGS="-g"
+ DEBUG_CFLAGS="-Wcheck -Wall -g -O0"
DEBUG_CPPFLAGS=
# Profile
@@ -73,6 +73,17 @@ if test "X-icc" = "X-$cc_vendor"; then
fi
+# Version specific ICC flags
+#
+# Please follow the pattern below by adding new versions at the top, copying
+# the information from the previous version and adding modifications to that.
+case "$cc_vendor-$cc_version" in
+ icc-8.0*)
+ # v8.0 -O3 infinite loops when compiling test/tselect.c. Use -O2.
+ PROD_CFLAGS="-O2"
+ ;;
+esac
+
# Clear cc info if no flags set
if test "X-$cc_flags_set" = "X-"; then
cc_vendor=