diff options
| author | wtc%netscape.com <devnull@localhost> | 1999-04-05 23:23:05 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1999-04-05 23:23:05 +0000 |
| commit | 06864848560a7031e90f93e6719169d27fb1035c (patch) | |
| tree | 767733a2b634cc2fe3af1b8889d5fe35a4a29c4d | |
| parent | 0cf2ea7d1b48c7c0fe6bd890ee7ccd3842b4fcf0 (diff) | |
| download | nspr-hg-06864848560a7031e90f93e6719169d27fb1035c.tar.gz | |
On Solaris, the prpoll test needs to link with -lsocket because
it calls BSD socket functions. Moved the rule for the attach
test to be together with other tests that need to link with -lpthread.
| -rw-r--r-- | pr/tests/Makefile | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pr/tests/Makefile b/pr/tests/Makefile index f34c10bf..c854f93b 100644 --- a/pr/tests/Makefile +++ b/pr/tests/Makefile @@ -431,14 +431,6 @@ else # All platforms that are not AIX pre-4.2. - -ifeq ($(USE_PTHREADS), 1) -$(OBJDIR)/attach: $(OBJDIR)/attach.$(OBJ_SUFFIX) - @$(MAKE_OBJDIR) - $(CC) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ -endif - - $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) ifeq ($(OS_ARCH), WINNT) @@ -475,7 +467,18 @@ install:: export clean:: rm -f $(TARGETS) +# The prpoll test calls BSD socket functions, so it needs to link +# with -lsocket on some platforms. +ifeq ($(OS_ARCH),SunOS) +ifneq ($(OS_RELEASE),4.1.3_U1) +$(OBJDIR)/prpoll: $(OBJDIR)/prpoll.o + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) -lsocket $(EXTRA_LIBS) -o $@ +endif +endif + ifeq ($(USE_PTHREADS), 1) +$(OBJDIR)/attach: $(OBJDIR)/attach.o + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ $(OBJDIR)/foreign: $(OBJDIR)/foreign.o $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ $(OBJDIR)/provider: $(OBJDIR)/provider.o |