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 /hl/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 'hl/c++/test')
| -rw-r--r-- | hl/c++/test/Makefile.am | 6 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.in | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/hl/c++/test/Makefile.am b/hl/c++/test/Makefile.am index 0eee1c1..d438e41 100644 --- a/hl/c++/test/Makefile.am +++ b/hl/c++/test/Makefile.am @@ -22,6 +22,12 @@ include $(top_srcdir)/config/commence.am # Include directories INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test +# 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=ptableTest diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 6b544f9..1029002 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -131,6 +131,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@ @@ -307,6 +309,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Include directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test +# 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 = ptableTest |