summaryrefslogtreecommitdiff
path: root/pr/tests
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2001-12-26 23:24:29 +0000
committerwtc%netscape.com <devnull@localhost>2001-12-26 23:24:29 +0000
commit283867664d17f12821c235a37dad21985d00e1c5 (patch)
tree485d9994708a06b0e600736beb19e6d4031fd740 /pr/tests
parent19a282736676330f99a6c18bdf8bb80d64ea5c16 (diff)
downloadnspr-hg-283867664d17f12821c235a37dad21985d00e1c5.tar.gz
Bugzilla bug 48308: checked in part of the patch to bring NSPR up to
OpenUNIX8 build with pthreads. The patch is contributed by Hiram Clawson <hiramc@caldera.com>. Modified files: _pth.h ptio.c ptthread.c pr/tests/Makefile.in Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
Diffstat (limited to 'pr/tests')
-rw-r--r--pr/tests/Makefile.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in
index fdbcfd28..7e8dbaf7 100644
--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
@@ -396,6 +396,13 @@ EXTRA_LIBS = -lsocket -lnsl -lresolv -ldl
export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
endif
+ifeq ($(OS_ARCH),OpenUNIX)
+export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
+ifeq ($(USE_PTHREADS),1)
+LDOPTS += -pthread
+endif
+endif
+
ifeq ($(OS_ARCH), UNIXWARE)
export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR)
endif
@@ -424,7 +431,7 @@ LIBPTHREAD = -lpthread
ifeq ($(OS_ARCH),AIX)
LIBPTHREAD = -lpthreads
endif
-ifeq (,$(filter-out FreeBSD OpenBSD BSD_OS NTO Darwin,$(OS_ARCH)))
+ifeq (,$(filter-out FreeBSD OpenBSD BSD_OS NTO Darwin OpenUNIX,$(OS_ARCH)))
LIBPTHREAD =
endif
ifeq ($(OS_ARCH)$(basename $(OS_RELEASE)),HP-UXB.10)