diff options
| author | cgd <cgd@NetBSD.org> | 1996-12-17 21:32:26 +0000 |
|---|---|---|
| committer | cgd <cgd@NetBSD.org> | 1996-12-17 21:32:26 +0000 |
| commit | b02b09670ac8100cab9ae5f3d323cdf7605bd5ef (patch) | |
| tree | 77cf5a6991388d16ef235af5ece407e690ad5dff /gnu/lib/libg++ | |
| parent | 3cc81b9726361f9935b1fabcfb6d88bbe8da05e6 (diff) | |
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.
Diffstat (limited to 'gnu/lib/libg++')
| -rw-r--r-- | gnu/lib/libg++/libg++/src/Makefile | 7 | ||||
| -rw-r--r-- | gnu/lib/libg++/libg++2netbsd | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gnu/lib/libg++/libg++/src/Makefile b/gnu/lib/libg++/libg++/src/Makefile index cf85afd7656..2cb74fa67d1 100644 --- a/gnu/lib/libg++/libg++/src/Makefile +++ b/gnu/lib/libg++/libg++/src/Makefile @@ -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 diff --git a/gnu/lib/libg++/libg++2netbsd b/gnu/lib/libg++/libg++2netbsd index 3fefc03d835..5f517349d86 100644 --- a/gnu/lib/libg++/libg++2netbsd +++ b/gnu/lib/libg++/libg++2netbsd @@ -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 |
