summaryrefslogtreecommitdiff
path: root/lib/tests
diff options
context:
space:
mode:
authorwtc%google.com <devnull@localhost>2012-11-13 23:18:00 +0000
committerwtc%google.com <devnull@localhost>2012-11-13 23:18:00 +0000
commitbeaf288280f9621fcafcbe13d7eb87701d03c3d3 (patch)
tree01b4d124c68e6df23e106ecc927cf06a8b81cac1 /lib/tests
parent5f63ffde464a55362178dca293e956bf674fcbba (diff)
downloadnspr-hg-beaf288280f9621fcafcbe13d7eb87701d03c3d3.tar.gz
Bug 804806: Remove code related to NCR, NEC, NEXTSTEP, SINIX, SNI, SONY,NSPR_4_9_4_BETA2
NEWS-OS, SunOS4, and SunOS 4.1.3_U1. Remove the os_ReliantUNIX.s file. TBR=ted. Modified Files: config/Makefile.in config/nsinstall.c lib/ds/Makefile.in lib/libc/src/Makefile.in lib/prstreams/Makefile.in lib/prstreams/tests/testprstrm/Makefile.in lib/tests/Makefile.in pr/include/gencfg.c pr/include/md/_unixos.h pr/include/private/primpl.h pr/src/Makefile.in pr/src/cplus/tests/Makefile.in pr/src/io/Makefile.in pr/src/io/prfile.c pr/src/io/prmapopt.c pr/src/linking/Makefile.in pr/src/linking/prlink.c pr/src/malloc/Makefile.in pr/src/md/prosdep.c pr/src/md/beos/beos_errors.c pr/src/md/unix/Makefile.in pr/src/md/unix/unix.c pr/src/md/unix/unix_errors.c pr/src/md/unix/uxproces.c pr/src/md/unix/uxrng.c pr/src/md/unix/uxwrap.c pr/src/misc/prtime.c pr/src/pthreads/Makefile.in pr/src/pthreads/ptio.c pr/src/threads/combined/Makefile.in pr/tests/Makefile.in pr/tests/dll/Makefile.in tools/Makefile.in Removed Files: pr/src/md/unix/os_ReliantUNIX.s
Diffstat (limited to 'lib/tests')
-rw-r--r--lib/tests/Makefile.in13
1 files changed, 0 insertions, 13 deletions
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
index 35b0982e..671b0402 100644
--- a/lib/tests/Makefile.in
+++ b/lib/tests/Makefile.in
@@ -102,13 +102,11 @@ endif
# Solaris
ifeq ($(OS_ARCH), SunOS)
-ifneq ($(OS_RELEASE), 4.1.3_U1)
ifdef NS_USE_GCC
LDOPTS += -Xlinker -R -Xlinker $(PWD)/$(dist_libdir)
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.
@@ -119,17 +117,6 @@ endif
endif
endif # SunOS
-ifeq ($(OS_ARCH), NCR)
-# NCR needs to link against -lsocket -lnsl (and -lc, which is linked
-# implicitly by $(CC)) again even though we already linked with these
-# system libraries when we built libnspr.so.
-EXTRA_LIBS = -lsocket -lnsl
-# 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.
-export LD_RUN_PATH = $(PWD)/$(dist_libdir)
-endif
-
#####################################################
#
# The rules