diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-15 17:08:41 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-15 17:08:41 (GMT) |
| commit | dd4360dccfda32f477192bd4a4ee22ee24585cf0 (patch) | |
| tree | 1a6d58a5ddaa88dfdac2e558e0ea65f38da73581 /config/powerpc-ibm-aix5.x | |
| parent | 2a2a49f42280220ad7cf2c45b1e5103d3b72146a (diff) | |
| download | hdf5-dd4360dccfda32f477192bd4a4ee22ee24585cf0.zip hdf5-dd4360dccfda32f477192bd4a4ee22ee24585cf0.tar.gz hdf5-dd4360dccfda32f477192bd4a4ee22ee24585cf0.tar.bz2 | |
[svn-r17645] Purpose:
Merge from Trunk
Description:
Merging all of my CFLAGS-related changes from trunk to 1.8
This includes revision #s: 17616, 17625, 17627, 17639, and 17643.
Tested:
h5committest and some additional checks on our FreeBSD as well
as NCSA's machines.
Diffstat (limited to 'config/powerpc-ibm-aix5.x')
| -rw-r--r-- | config/powerpc-ibm-aix5.x | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x index 80925f0..45cbd89 100644 --- a/config/powerpc-ibm-aix5.x +++ b/config/powerpc-ibm-aix5.x @@ -48,7 +48,7 @@ case $CC_BASENAME in enable_shared="${enable_shared:-no}" # Use -D_LARGE_FILES by default to support large file size. # Make sure this is applied to other API compile options such as C++. - CFLAGS="-qlanglvl=stdc99 -D_LARGE_FILES $CFLAGS" + AM_CFLAGS="-qlanglvl=stdc99 -D_LARGE_FILES $AM_CFLAGS" DEBUG_CFLAGS="-g -qfullpath" DEBUG_CPPFLAGS= # -O causes test/dtypes to fail badly. Turn it off for now. @@ -63,7 +63,7 @@ case $CC_BASENAME in ;; *) - CFLAGS="$CFLAGS -ansi" + H5_CFLAGS="$H5_CFLAGS -ansi" DEBUG_CFLAGS="-g" DEBUG_CPPFLAGS= PROD_CFLAGS="-O" @@ -134,9 +134,15 @@ if test "X-" = "X-$FC"; then fi fi +# While we try to avoid setting FCFLAGS directly for use in compilation, in +# this case we need the -k flag present for some configure checks. As such, +# the configure script saves the user's set FCFLAGS before running, and +# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS +# to ensure the flag is present for both configure as well as for the build. if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="-qsuffix=f=f90" FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k" + H5_FCFLAGS="$H5_FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k" FSEARCH_DIRS="-I./ -I../src" DEBUG_FCFLAGS="-O" PROD_FCFLAGS="-O" @@ -157,6 +163,7 @@ CXX=${CXX=xlC} # Added -qweaksymbol to suppress linker messages warning of duplicate # symbols; these warnings are harmless. - BMR # Use -D_LARGE_FILES by default to support large file size. -CXXFLAGS="$CXXFLAGS -qweaksymbol -D_LARGE_FILES" +H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol" +AM_CXXFLAGS="$AM_CXXFLAGS -D_LARGE_FILES" |