diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-06-24 05:02:15 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-06-24 05:02:15 +0000 |
| commit | e4c4022498bc05de5bea07c5388896ff89a6037f (patch) | |
| tree | da5a6731a98b7f59d81d435a0843c6ddf7e50514 | |
| parent | fba38bb2fabd56405e9e8be54c5badd105a21ab6 (diff) | |
| download | nspr-hg-e4c4022498bc05de5bea07c5388896ff89a6037f.tar.gz | |
Bugzilla bug #86785: link with -lpthread -lthread on all versions of
Solaris to ensure the correct library linking order.
| -rw-r--r-- | pr/tests/Makefile.in | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index 9ea4c648..c1931a47 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -324,20 +324,11 @@ ifeq ($(OS_ARCH), SunOS) 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 |