summaryrefslogtreecommitdiff
path: root/lib/tests
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2008-05-03 22:28:44 +0000
committerwtc%google.com <devnull@localhost>2008-05-03 22:28:44 +0000
commit218a30c10e84ae074f05a11ef23d567c5c26f7fd (patch)
treef5a02823d7ec976b8764e2c0e09a0f0bb3ef764a /lib/tests
parent11ab9ebc62a89b4335dff4d98f5a1abfd0dae966 (diff)
downloadnspr-hg-218a30c10e84ae074f05a11ef23d567c5c26f7fd.tar.gz
Bug 430884: restored the -lpthread linker options (and the associated
comments) removed in the previous checkin. Remove the LOCAL_THREADS_ONLY build variable; now Solaris can just use the CLASSIC_NSPR build variable. Modified Files: lib/msgc/tests/Makefile.in lib/prstreams/tests/testprstrm/Makefile.in lib/tests/Makefile.in pr/include/md/_solaris.h pr/src/Makefile.in pr/src/cplus/tests/Makefile.in pr/tests/Makefile.in tools/Makefile.in
Diffstat (limited to 'lib/tests')
-rw-r--r--lib/tests/Makefile.in8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index 23f4f42e..493cd006 100644
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@@ -151,6 +151,14 @@ else
LDOPTS += -R $(PWD)/$(dist_libdir)
endif
endif
+
+# SunOS 5.5 needs to link with -lpthread, even though we already
+# linked with this system library when we built libnspr.so.
+ifeq ($(OS_RELEASE), 5.5)
+ifdef USE_PTHREADS
+EXTRA_LIBS = -lpthread
+endif
+endif
endif # SunOS
ifeq ($(OS_ARCH), NCR)