Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/gnu/usr.bin/egcs/cpp pull up 1.11, 1.12, 1.13 (approved...



details:   https://anonhg.NetBSD.org/src/rev/8bd0bb857032
branches:  netbsd-1-5
changeset: 488957:8bd0bb857032
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Aug 07 01:51:15 2000 +0000

description:
pull up 1.11, 1.12, 1.13 (approved by thorpej):
>don't build egcs 1.1.2 on sparc64; it is broken and useless

>fix part of previous: do install /usr/bin/cpp on sparc64.

>Move the include of <bsd.prog.mk> to the old place to build the manpage
>correctly and also move cexp.c after the include to get the ${DIST} path.

diffstat:

 gnu/usr.bin/egcs/cpp/Makefile |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 9662b88b0c2a -r 8bd0bb857032 gnu/usr.bin/egcs/cpp/Makefile
--- a/gnu/usr.bin/egcs/cpp/Makefile     Mon Aug 07 01:49:59 2000 +0000
+++ b/gnu/usr.bin/egcs/cpp/Makefile     Mon Aug 07 01:51:15 2000 +0000
@@ -1,6 +1,9 @@
 #      from: @{#}Makefile      6.4 (Berkeley) 2/21/91
-#      $NetBSD: Makefile,v 1.10 1999/01/18 21:14:50 christos Exp $
+#      $NetBSD: Makefile,v 1.10.8.1 2000/08/07 01:51:15 mrg Exp $
 
+.include <bsd.own.mk>
+
+.if (${MACHINE_ARCH} != "sparc64")
 HAVE_GCC28!=   ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
 
 PROG=          cpp
@@ -11,6 +14,7 @@
 .if empty(HAVE_GCC28)
 CWARNFLAGS+=   -Wno-error
 .endif
+.endif
 
 LINKS=         /usr/bin/cpp /usr/bin/gcpp
 FILES=         usr.bin.cpp.sh
@@ -21,8 +25,10 @@
 MAN=           cccp.1
 MLINKS=                cccp.1 cpp.1 cccp.1 gcpp.1
 
+.include <bsd.prog.mk>
+
+.if (${MACHINE_ARCH} != "sparc64")
 .NOPATH: cexp.c
 .BEGIN:
        @rm -f ${DIST}/cexp.c
-
-.include <bsd.prog.mk>
+.endif



Home | Main Index | Thread Index | Old Index