summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorjmc <jmc@NetBSD.org>2001-11-26 18:19:47 +0000
committerjmc <jmc@NetBSD.org>2001-11-26 18:19:47 +0000
commit0aba719980be19a7fa6b8ad2b2ee00822768bedd (patch)
treee36694db87e33df0685394af832a5748733383d8 /gnu
parent7eac246b749f488b191120f5c19c581f6d4db385 (diff)
A few things to make r/o source trees work that might have timestamps on the
dist .y and .c files reversed. 1. Move the .y.c and other assorted implicit rule overrides out of Makefile.inc and into local Makefile's. The system Makefile (bsd.sys.mk) sets up .l.c and .y.c rules so unless these come after all inclusions they just get ignored. 2. Add @true as the command for any of the rule overrides. Otherwise make still bails complaining about not knowing how to build the requisite .c or .h file. This obviously wasn't tested before as it couldn't have worked as-is.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/binutils/Makefile.inc5
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile7
-rw-r--r--gnu/usr.bin/gcc/Makefile.backend6
-rw-r--r--gnu/usr.bin/gcc/Makefile.inc5
-rw-r--r--gnu/usr.bin/gcc/cpp0/Makefile6
5 files changed, 18 insertions, 11 deletions
diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index 39b08ef075c..86aa4ffb289 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2001/08/06 19:11:59 tv Exp $
+# $NetBSD: Makefile.inc,v 1.10 2001/11/26 18:19:47 jmc Exp $
.if !defined(__MAKEFILE_INC_INCLUDED__)
__MAKEFILE_INC_INCLUDED__=1
@@ -7,9 +7,6 @@ __MAKEFILE_INC_INCLUDED__=1
.if defined(USE_NEW_TOOLCHAIN)
-# Make sure we use the pre-generated C files
-.l.c .y.c:
-
GCPPFLAGS= ${G_DEFS} ${G_INCLUDES}
CPPFLAGS+= ${GCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GCPPFLAGS:M-I*:N-I.*} \
-I${TOP}/lib/libbfd/arch/${MACHINE_ARCH} \
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index a9052c4356d..a02c1146ff6 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/10/04 17:46:22 tv Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/26 18:19:48 jmc Exp $
TOP= ${.CURDIR}/../../..
DIST= ${TOP}/dist/toolchain
+
.include <bsd.own.mk>
.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
@@ -76,6 +77,10 @@ e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed
.include <bsd.prog.mk>
.include <bsd.info.mk>
+# Make sure we use the pre-generated C files
+.l.c .y.c .y.h:
+ @true
+
cleanprog: __cleanldscripts
__cleanldscripts:
-rm -rf ldscripts
diff --git a/gnu/usr.bin/gcc/Makefile.backend b/gnu/usr.bin/gcc/Makefile.backend
index ad6c23da154..fe25bfd5e1f 100644
--- a/gnu/usr.bin/gcc/Makefile.backend
+++ b/gnu/usr.bin/gcc/Makefile.backend
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.1 2001/06/18 16:18:30 tv Exp $
+# $NetBSD: Makefile.backend,v 1.2 2001/11/26 18:19:48 jmc Exp $
MKMAN= no
BINDIR= /usr/libexec
@@ -15,3 +15,7 @@ DPADD= ${BACKENDOBJ}/libbackend.a ${LIBIBERTYOBJ}/libiberty.a
LDADD= -L${BACKENDOBJ} -lbackend -L${LIBIBERTYOBJ} -liberty
.include <bsd.prog.mk>
+
+# Don't auto-frob .y or .l files.
+.l.c .y.c .y.h:
+ @true
diff --git a/gnu/usr.bin/gcc/Makefile.inc b/gnu/usr.bin/gcc/Makefile.inc
index c8e8848f545..8747451c2db 100644
--- a/gnu/usr.bin/gcc/Makefile.inc
+++ b/gnu/usr.bin/gcc/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2001/06/18 16:18:31 tv Exp $
+# $NetBSD: Makefile.inc,v 1.2 2001/11/26 18:19:48 jmc Exp $
TOP= ${.CURDIR}/../../..
DIST= ${TOP}/dist/toolchain
@@ -7,7 +7,4 @@ GCCARCH= ${.CURDIR}/../arch/${MACHINE_ARCH}
CPPFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -DNETBSD_NATIVE
-# Don't auto-frob .y or .l files.
-.l.c .y.c .y.h:
-
.include "${GCCARCH}/defs.mk"
diff --git a/gnu/usr.bin/gcc/cpp0/Makefile b/gnu/usr.bin/gcc/cpp0/Makefile
index 3503319cc59..6a316b95c05 100644
--- a/gnu/usr.bin/gcc/cpp0/Makefile
+++ b/gnu/usr.bin/gcc/cpp0/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2001/07/18 14:01:14 tv Exp $
+# $NetBSD: Makefile,v 1.2 2001/11/26 18:19:49 jmc Exp $
.include <bsd.own.mk>
@@ -14,4 +14,8 @@ BINDIR= /usr/libexec
.include <bsd.prog.mk>
+# Don't auto-frob .y or .l files.
+.l.c .y.c .y.h:
+ @true
+
.PATH: ${DIST}/gcc