Bugzilla bug #86785: link with -lpthread -lthread on all versions of
authorwtc%netscape.com
Sun, 24 Jun 2001 05:02:15 +0000
changeset 1971 aaa7fc36c341476cd5f72bacfa57d3787f398924
parent 1970 92ca2c6fa1606fb03c547c2a3debbdf495b1a387
child 1972 e7959845c30f4f3a1bec77ebe13e4b00b3a4b95f
push idunknown
push userunknown
push dateunknown
bugs86785
Bugzilla bug #86785: link with -lpthread -lthread on all versions of Solaris to ensure the correct library linking order.
pr/tests/Makefile.in
--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
@@ -319,30 +319,21 @@ ifeq ($(OS_ARCH), SunOS)
             ifeq ($(USE_CPLUS), 1)
                 CC = CC
             endif
             LDOPTS += -R $(ABSOLUTE_LIB_DIR)
         endif
     endif
 
     ifneq ($(LOCAL_THREADS_ONLY),1)
-# SunOS 5.4 and 5.5 need to link with -lthread or -lpthread,
-# even though we already linked with these system libraries
-# when we built libnspr.so.
-        ifeq ($(OS_RELEASE), 5.4)
+        ifdef USE_PTHREADS
+            EXTRA_LIBS = -lpthread -lthread
+        else
             EXTRA_LIBS = -lthread
         endif
-
-        ifeq ($(OS_RELEASE), 5.5)
-            ifdef USE_PTHREADS
-                EXTRA_LIBS = -lpthread
-            else
-                EXTRA_LIBS = -lthread
-            endif
-        endif
     endif # LOCAL_THREADS_ONLY
 endif # SunOS
 
 ifeq ($(OS_ARCH), NEC)
     EXTRA_LIBS = $(OS_LIBS)
 # This hardcodes in the executable programs the directory to find
 # libnspr.so etc. at program startup.  Equivalent to the -R or -rpath
 # option for ld on other platforms.