diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-11-14 20:23:10 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-11-14 20:23:10 (GMT) |
| commit | 5967e0542a5b4ec25e91b5564c5519daefe77e30 (patch) | |
| tree | f07895e3c8e2512676fcf7264627925e398fe7a8 | |
| parent | 217d9341339c9127a4b04e05a70b92ca3c512439 (diff) | |
| download | hdf5-5967e0542a5b4ec25e91b5564c5519daefe77e30.zip hdf5-5967e0542a5b4ec25e91b5564c5519daefe77e30.tar.gz hdf5-5967e0542a5b4ec25e91b5564c5519daefe77e30.tar.bz2 | |
[svn-r7852] Purpose:
Bug Fix
Description:
CXXFLAGS and CPPFLAGS wasn't including user-set values.
Solution:
Changed CXXFLAGS="..." to CXXFLAGS="$CXXFLAGS ..." and CPPFLAGS="..."
to CPPFLAGS="$CPPFLAGS ..."
Platforms tested:
Kelgia,
Modi4
Arabica
(the machines affected)
Misc. update:
| -rw-r--r-- | c++/config/hpux11.00 | 4 | ||||
| -rw-r--r-- | c++/config/irix6.x | 2 | ||||
| -rw-r--r-- | c++/config/solaris2.x | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/c++/config/hpux11.00 b/c++/config/hpux11.00 index 0485e2d..6f817c1 100644 --- a/c++/config/hpux11.00 +++ b/c++/config/hpux11.00 @@ -13,8 +13,8 @@ fi if test -z "$cxx_flags_set"; then # +Z for PIC, +A for using archived libraries - CXXFLAGS="+Z +A" - CFLAGS="-g +O2" + CXXFLAGS="$CXXFLAGS +Z +A" + CFLAGS="$CFLAGS -g +O2" DEBUG_CXXFLAGS=-g DEBUG_CPPFLAGS= PROD_CXXFLAGS="-O -s" diff --git a/c++/config/irix6.x b/c++/config/irix6.x index dad44c5..5bf7a5b 100644 --- a/c++/config/irix6.x +++ b/c++/config/irix6.x @@ -16,7 +16,7 @@ fi if test -z "$cxx_flags_set"; then # -LANG:std required for std use; -ptused causes templates used to be # instantiated - CPPFLAGS="-LANG:std -ptused" + CPPFLAGS="$CPPFLAGS -LANG:std -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/c++/config/solaris2.x b/c++/config/solaris2.x index 8c7b593..496a0c4 100644 --- a/c++/config/solaris2.x +++ b/c++/config/solaris2.x @@ -25,14 +25,14 @@ cxx_vers_patch=`echo $cxx_version | cut -f3 -d.` # Specify the "-features=tmplife" if the compiler can handle this... if test -n "$cxx_version"; then if test $cxx_vers_major -ge 5 -a $cxx_vers_minor -ge 3 -o $cxx_vers_major -gt 5; then - CXXFLAGS="-features=tmplife" + CXXFLAGS="$CXXFLAGS -features=tmplife" fi fi # Try solaris native compiler flags if test -z "$cxx_flags_set"; then CXXFLAGS="$CXXFLAGS -instances=global" - CPPFLAGS="-LANG:std" + CPPFLAGS="$CPPFLAGS -LANG:std" LIBS="$LIBS -lsocket" DEBUG_CXXFLAGS=-g DEBUG_CPPFLAGS= |