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/solaris2.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/solaris2.x')
-rw-r--r-- | config/solaris2.x | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/solaris2.x b/config/solaris2.x index c81fd61..f5a4df1 100644 --- a/config/solaris2.x +++ b/config/solaris2.x @@ -45,7 +45,7 @@ if test "X-" = "X-$cc_flags_set"; then 5.9*) # Need the xopenmp flag to build the Fortran library if test X-$enable_fortran = X-yes; then - LDFLAGS="$LDFLAGS -xopenmp=stubs" + AM_LDFLAGS="$AM_LDFLAGS -xopenmp=stubs" fi ;; esac @@ -68,7 +68,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FCFLAGS="$FCFLAGS" + H5_FCFLAGS="$H5_FCFLAGS" DEBUG_FCFLAGS="" PROD_FCFLAGS="" PROFILE_FCFLAGS="" |