on the Alpha, don't include c++rt0.o on the link line. (1) it doesn't

exist, and (2) its purpose on the link line is taken care of automatically
by the library-building process.
This commit is contained in:
cgd 1996-12-17 21:32:26 +00:00
parent 3cc81b9726
commit b02b09670a
2 changed files with 12 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.2 1996/12/17 18:57:01 phil Exp $
# $NetBSD: Makefile,v 1.2 1996/12/17 21:32:27 cgd Exp $
LIB= g++
@ -16,8 +16,13 @@ timer.c
CXXFLAGS+= -nostdinc++ -I$(.CURDIR)/../../include \
-I$(.CURDIR)/../../libio -I$(.CURDIR)/../../libstdc++
CFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../../libio
.if (${MACHINE} == "alpha")
LDADD= -lcurses
DPADD= ${LIBCURSES}
.else
LDADD= ${DESTDIR}/usr/lib/c++rt0.o -lcurses
DPADD= ${DESTDIR}/usr/lib/c++rt0.o ${LIBCURSES}
.endif
NOMAN= noman
LIBCURSES!= printf "xxx:\n\techo \$${LIBCURSES}\n.include <bsd.prog.mk>" |\
$(MAKE) -r -s -f - xxx | grep curses

View File

@ -1,6 +1,6 @@
#!/usr/local/bin/perl
#
# $NetBSD: libg++2netbsd,v 1.12 1996/12/17 19:14:16 phil Exp $
# $NetBSD: libg++2netbsd,v 1.13 1996/12/17 21:32:26 cgd Exp $
#
# Perl script to convert a standard distribution directory for libg++ into
# a NetBSD source tree.
@ -506,8 +506,13 @@ LIB= g++
CXXFLAGS+= -nostdinc++ -I$(.CURDIR)/../../include \
-I$(.CURDIR)/../../libio -I$(.CURDIR)/../../libstdc++
CFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/../../libio
.if (${MACHINE} == "alpha")
LDADD= -lcurses
DPADD= ${LIBCURSES}
.else
LDADD= ${DESTDIR}/usr/lib/c++rt0.o -lcurses
DPADD= ${DESTDIR}/usr/lib/c++rt0.o ${LIBCURSES}
.endif
NOMAN= noman
LIBCURSES!= printf "xxx:\n\techo \$${LIBCURSES}\n.include <bsd.prog.mk>" |\
$(MAKE) -r -s -f - xxx | grep curses