summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/craynv14
-rw-r--r--config/irix5.x4
-rw-r--r--config/irix6.x9
-rw-r--r--config/powerpc-apple5
-rw-r--r--config/powerpc-ibm-aix4.x6
-rw-r--r--config/powerpc-ibm-aix5.x9
6 files changed, 25 insertions, 22 deletions
diff --git a/config/craynv b/config/craynv
index 4097f78..e877303 100644
--- a/config/craynv
+++ b/config/craynv
@@ -87,7 +87,7 @@ RANLIB=:
case $CC_BASENAME in
gcc)
- CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
+ H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O3 -fomit-frame-pointer"
@@ -97,7 +97,7 @@ case $CC_BASENAME in
;;
cc)
- CFLAGS="$CFLAGS"
+ H5_CFLAGS="$H5_CFLAGS"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CFLAGS=""
@@ -107,7 +107,7 @@ case $CC_BASENAME in
;;
*)
- CFLAGS="$CFLAGS -ansi"
+ H5_CFLAGS="$H5_CFLAGS -ansi"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O"
@@ -147,7 +147,9 @@ fi
if test "X-" = "X-$f9x_flags_set"; then
# -Wl passes flags to the linker and -M# will ignore warnings with
- # number #. Warning 405 and 412 were stopping the executable from being built.
+ # number#. Warning 405 and 412 were stopping the executable from
+ # being built.
+ # The -em flag enables .mod files, which is what HDF5 builds.
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
FCFLAGS="$FCFLAGS -em"
@@ -166,7 +168,7 @@ fi
case $CXX_BASENAME in
g++)
- CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions
+ H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CXXFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
@@ -176,7 +178,7 @@ case $CXX_BASENAME in
;;
*)
- CXXFLAGS="$CXXFLAGS"
+ H5_CXXFLAGS="$H5_CXXFLAGS"
DEBUG_CXXFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CXXFLAGS=""
diff --git a/config/irix5.x b/config/irix5.x
index 1ac789a..e76a443 100644
--- a/config/irix5.x
+++ b/config/irix5.x
@@ -38,7 +38,7 @@ RANLIB=:
case "X-$CC_BASENAME" in
X-gcc)
- CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
+ H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
DEBUG_CFLAGS="-g -fverbose-asm"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O3"
@@ -55,7 +55,7 @@ case "X-$CC_BASENAME" in
#CFLAGS="$CFLAGS -ansi"
# Always turn off these compiler warnings:
- CFLAGS="$CFLAGS -woff 799"
+ H5_CFLAGS="$H5_CFLAGS -woff 799"
# Extra debugging flags
DEBUG_CFLAGS=-g
diff --git a/config/irix6.x b/config/irix6.x
index e133cf8..6cfe04c 100644
--- a/config/irix6.x
+++ b/config/irix6.x
@@ -73,7 +73,7 @@ case "X-$CC_BASENAME" in
# 1685: turn off warnings about turning off invalid warnings
# 3201: remark - parameter not referenced
#CFLAGS="$CFLAGS -woff 1174,1429,1209,1196,1685,3201"
- CFLAGS="$CFLAGS -woff 1209,3201"
+ H5_CFLAGS="$H5_CFLAGS -woff 1209,3201"
# Always turn off these compiler warnings for the old compiler:
# 799: the `long long' type is not standard
@@ -87,7 +87,7 @@ case "X-$CC_BASENAME" in
# 84: a library is not used
# 85: duplicate definition preemption (from -lnsl)
# 134: duplicate weak definition preemption (from -lnsl)
- CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
+ H5_CFLAGS="$H5_CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
fi
# Extra debugging flags
@@ -113,7 +113,7 @@ fi
if test "X-" = "X-$f9x_flags_set"; then
F9XSUFFIXFLAG=""
FSEARCH_DIRS=""
- FCFLAGS="$FCFLAGS -mips4 -O -s"
+ H5_FCFLAGS="$H5_FCFLAGS -mips4 -O -s"
DEBUG_FCFLAGS="-mips4 -O -s"
PROD_FCFLAGS="-mips4 -O -s"
PROFILE_FCFLAGS="-mips4 -O -s"
@@ -132,7 +132,8 @@ fi
if test -z "$cxx_flags_set"; then
# -LANG:std required for std use; -ptused causes templates used to be
# instantiated
- CPPFLAGS="$CPPFLAGS -LANG:std -ptused"
+ CPPFLAGS="$CPPFLAGS -LANG:std"
+ H5_CPPFLAGS="$H5_CPPFLAGS -ptused"
# libCio is a default library, since libtool before 1.5 doesn't fully
# support C++ yet, default libraries must be explicitly specified.
diff --git a/config/powerpc-apple b/config/powerpc-apple
index b746402..6870017 100644
--- a/config/powerpc-apple
+++ b/config/powerpc-apple
@@ -50,7 +50,8 @@ fi
case $FC_BASENAME in
xlf)
F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90"
- FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ "
+ FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG}"
+ H5_FCFLAGS="$H5_FCFLAGS -qmoddir=./ "
FSEARCH_DIRS="-I./ -I../src"
DEBUG_FCFLAGS="-g"
PROD_FCFLAGS="-O"
@@ -63,7 +64,7 @@ case $FC_BASENAME in
F9XSUFFIXFLAG=""
# We force compiler to use upper case for external names
# (just in case since this should be a default EIP)
- FCFLAGS="$FCFLAGS -YEXT_NAMES=UCS"
+ H5_FCFLAGS="$H5_FCFLAGS -YEXT_NAMES=UCS"
FSEARCH_DIRS=""
DEBUG_FCFLAGS="-g"
PROD_FCFLAGS="-O"
diff --git a/config/powerpc-ibm-aix4.x b/config/powerpc-ibm-aix4.x
index 7fc6994..c5af6df 100644
--- a/config/powerpc-ibm-aix4.x
+++ b/config/powerpc-ibm-aix4.x
@@ -27,9 +27,6 @@
#CFLAGS="$CFLAGS -ansi"
#CPPFLAGS="$CPPFLAGS -I."
-# CFLAGS must be set else configure set it to -g
-CFLAGS="$CFLAGS"
-
# What compiler flags should be used for code development?
DEBUG_CFLAGS=
DEBUG_CPPFLAGS=
@@ -104,7 +101,8 @@ fi
if test "X-" = "X-$f9x_flags_set"; then
F9XSUFFIXFLAG="-qsuffix=f=f90"
- FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+ FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG} -k"
+ H5_FCFLAGS="$H5_FCFLAGS -static -qmoddir=./"
FSEARCH_DIRS="-I./ -I../src"
DEBUG_FCFLAGS="-O"
PROD_FCFLAGS="-O"
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index 833ae3f..2b79ca3 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -45,7 +45,7 @@ case $CC_BASENAME in
# Turn off shared lib option. It causes some test suite to fail.
enable_shared="${enable_shared:-no}"
# Use -D_LARGE_FILES by default to support large file size.
- CFLAGS="-qlanglvl=ansi -D_LARGE_FILES -DSTDC $CFLAGS"
+ H5_CFLAGS="$H5_CFLAGS -qlanglvl=ansi -D_LARGE_FILES -DSTDC $CFLAGS"
DEBUG_CFLAGS="-g -qfullpath"
DEBUG_CPPFLAGS=
# -O causes test/dtypes to fail badly. Turn it off for now.
@@ -60,7 +60,7 @@ case $CC_BASENAME in
;;
*)
- CFLAGS="$CFLAGS -ansi"
+ H5_CFLAGS="$H5_CFLAGS -ansi"
DEBUG_CFLAGS="-g"
DEBUG_CPPFLAGS=
PROD_CFLAGS="-O"
@@ -133,7 +133,8 @@ fi
if test "X-" = "X-$f9x_flags_set"; then
F9XSUFFIXFLAG="-qsuffix=f=f90"
- FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+ FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG} -k"
+ H5_FCFLAGS="$H5_FCFLAGS -static -qmoddir=./"
FSEARCH_DIRS="-I./ -I../src"
DEBUG_FCFLAGS="-O"
PROD_FCFLAGS="-O"
@@ -153,6 +154,6 @@ CXX=${CXX=xlC}
# Added -qweaksymbol to suppress linker messages warning of duplicate
# symbols; these warnings are harmless. - BMR
-CXXFLAGS="$CXXFLAGS -qweaksymbol"
+H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol"
generated by cgit v0.12 at 2024-11-17 05:57:04 (GMT)