Fix for bug 430883 . NSPR does not need to link with libthread on Solaris . r=wtc
authorjulien.pierre.boogz%sun.com
Sat, 26 Apr 2008 02:22:58 +0000
changeset 3943 03097009752461f526629e0d584f474702aaa7fd
parent 3942 fabadbafa79eafcffe7e4feb9bba976330db3a99
child 3944 d4762c2072a5532742312721c72540402a71ec2b
push idunknown
push userunknown
push dateunknown
reviewerswtc
bugs430883
Fix for bug 430883 . NSPR does not need to link with libthread on Solaris . r=wtc
pr/src/Makefile.in
pr/tests/Makefile.in
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -90,17 +90,17 @@ endif
 LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE)))
 ifeq (5.7, $(LIBRT_TEST))
 LIBRT=-lrt
 else
 LIBRT=-lposix4
 endif
 
 ifdef USE_PTHREADS
-OS_LIBS			= -lpthread -lthread ${LIBRT} -lsocket -lnsl -ldl -lc
+OS_LIBS			= -lpthread ${LIBRT} -lsocket -lnsl -ldl -lc
 else
 ifdef LOCAL_THREADS_ONLY
 OS_LIBS			= -lsocket -lnsl -ldl -lc
 else
 OS_LIBS			= -lthread ${LIBRT} -lsocket -lnsl -ldl -lc
 endif	# LOCAL_THREADS_ONLY
 endif	# USE_PTHREADS
 ifeq ($(OS_TEST),sun4u)
--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
@@ -329,17 +329,17 @@ ifeq ($(OS_ARCH), SunOS)
                 CC = CC
             endif
             LDOPTS += -R $(ABSOLUTE_LIB_DIR)
         endif
     endif
 
     ifneq ($(LOCAL_THREADS_ONLY),1)
         ifdef USE_PTHREADS
-            EXTRA_LIBS = -lpthread -lthread
+            EXTRA_LIBS = -lpthread
         else
             EXTRA_LIBS = -lthread
         endif
     endif # LOCAL_THREADS_ONLY
 endif # SunOS
 
 ifeq ($(OS_ARCH), NEC)
     EXTRA_LIBS = $(OS_LIBS)