summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-02-17 18:15:58 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-02-17 18:15:58 (GMT)
commitb3df4e9c8d716db4ea2680f6bb4ac16d1084dea5 (patch)
tree40c2d15b8645f9aad71c455522dbd22e91b6283d
parent52705fa6f0e093bcde34f79ebc690b87504bf712 (diff)
downloadhdf5-b3df4e9c8d716db4ea2680f6bb4ac16d1084dea5.zip
hdf5-b3df4e9c8d716db4ea2680f6bb4ac16d1084dea5.tar.gz
hdf5-b3df4e9c8d716db4ea2680f6bb4ac16d1084dea5.tar.bz2
[svn-r29142] Updated the Intel files in config to use the new NO_SYMBOLS flags
and modified the failsafe configure flags in ibm-aix to use the new scheme.
-rw-r--r--config/ibm-aix49
-rw-r--r--config/intel-fflags1
-rw-r--r--config/intel-flags7
3 files changed, 44 insertions, 13 deletions
diff --git a/config/ibm-aix b/config/ibm-aix
index 28498e2..ef052fb 100644
--- a/config/ibm-aix
+++ b/config/ibm-aix
@@ -59,9 +59,25 @@ if test "X-" = "X-$f9x_flags_set"; then
FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG}"
H5_FCFLAGS="$H5_FCFLAGS ${F9XSUFFIXFLAG}"
FSEARCH_DIRS="-I./ -I../src"
- DEBUG_FCFLAGS="-g"
- PROD_FCFLAGS="-O"
- PROFILE_FCFLAGS="-g -pg"
+
+ # Produciton
+ PROD_FCFLAGS=
+
+ # Debug
+ DEBUG_FCFLAGS=
+
+ # Symbols
+ SYMBOLS_FCFLAGS="-g"
+ NO_SYMBOLS_FCFLAGS=
+
+ # Profiling
+ PROFILE_FCFLAGS="-pg"
+
+ # Optimization
+ HIGH_OPT_FCFLAGS="-O"
+ DEBUG_OPT_FCFLAGS=
+ NO_OPT_FCFLAGS=
+
f9x_flags_set=yes
fi
@@ -91,13 +107,30 @@ case $CC_BASENAME in
;;
*)
+ # Undetermined compiler
+ # Use very generic flags
H5_CFLAGS="$H5_CFLAGS -ansi"
- DEBUG_CFLAGS="-g"
- DEBUG_CPPFLAGS=
- PROD_CFLAGS="-O"
- PROD_CPPFLAGS=
+
+ # Produciton
+ PROD_CFLAGS=
+
+ # Debug
+ DEBUG_CFLAGS=
+
+ # Symbols
+ SYMBOLS_CFLAGS="-g"
+ NO_SYMBOLS_CFLAGS=
+
+ # Profiling
PROFILE_CFLAGS="-pg"
- PROFILE_CPPFLAGS=
+
+ # Optimization
+ HIGH_OPT_CFLAGS="-O"
+ DEBUG_OPT_CFLAGS=
+ NO_OPT_CFLAGS=
+
+ # Flags are set
+ cc_flags_set=yes
;;
esac
diff --git a/config/intel-fflags b/config/intel-fflags
index 1f7cf78..db9543e 100644
--- a/config/intel-fflags
+++ b/config/intel-fflags
@@ -80,6 +80,7 @@ if test "X-ifort" = "X-$f9x_vendor"; then
# Symbols
SYMBOLS_FCFLAGS="-g"
+ NO_SYMBOLS_FCFLAGS=
# Profiling
# Use this for profiling with gprof
diff --git a/config/intel-flags b/config/intel-flags
index 060e78a..fe7b06d 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -70,23 +70,20 @@ if test "X-icc" = "X-$cc_vendor"; then
# Default to C99 standard.
H5_CFLAGS="${H5_CFLAGS:--std=c99 $arch} -Wcheck -Wall"
- # Production is set to default; see settings for specific version further down
+ # Production
PROD_CFLAGS=
- PROD_CPPFLAGS=
# Debug
# NDEBUG is handled explicitly in configure
DEBUG_CFLAGS=
- DEBUG_CPPFLAGS=
# Symbols
SYMBOLS_CFLAGS="-g"
- SYMBOLS_CPPFLAGS=
+ NO_SYMBOLS_CFLAGS=
# Profiling
# Use this for profiling with gprof
PROFILE_CFLAGS="-p"
- PROFILE_CPPFLAGS=
# Optimization
HIGH_OPT_CFLAGS="-O"