diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-09-16 21:16:11 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-09-16 21:16:11 (GMT) |
| commit | b656c90c8a86eb7cb2d14baaadcc23fd8f22fbad (patch) | |
| tree | 4b6a7c7abb7be441d37e87ac0d549b421e540186 /c++/test | |
| parent | cc8f7d98bf0a373e397faecd14e3480cf5c0777d (diff) | |
| download | hdf5-b656c90c8a86eb7cb2d14baaadcc23fd8f22fbad.zip hdf5-b656c90c8a86eb7cb2d14baaadcc23fd8f22fbad.tar.gz hdf5-b656c90c8a86eb7cb2d14baaadcc23fd8f22fbad.tar.bz2 | |
[svn-r11420] Purpose:
Bug fix
Description:
Disabled C++ shared libraries for Sun Workshop compiler.
Solution:
This bug only seems to happen when using the -xarch=v9 flag to compile in
64-bit mode, but disabling shared libraries entirely for this compiler is
an easier fix (I don't know how to detect 64 bit mode from the command line).
The framework for disabling shared libraries for other C++ compilers is
in place.
Platforms tested:
sol, mir, sleipnir, modi4
Diffstat (limited to 'c++/test')
| -rw-r--r-- | c++/test/Makefile.am | 6 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am index 2f5edf5..35de101 100644 --- a/c++/test/Makefile.am +++ b/c++/test/Makefile.am @@ -22,6 +22,12 @@ include $(top_srcdir)/config/commence.am # Include src, test, and c++/src directories INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src +# Shared C++ libraries aren't universally supported. +if CXX_SHARED_CONDITIONAL +else + AM_LDFLAGS=-static +endif + # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. TEST_PROG=dsets testhdf5 diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 02fc2c2..6990f59 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -137,6 +137,8 @@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@ +CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@ CYGPATH_W = @CYGPATH_W@ DEBUG_PKG = @DEBUG_PKG@ DEFS = @DEFS@ @@ -313,6 +315,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Include src, test, and c++/src directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src +# Shared C++ libraries aren't universally supported. +@CXX_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static + # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. TEST_PROG = dsets testhdf5 |