From 60eab6798ae3710ae18124c48d3881ffb0fa074e Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 4 Jul 2017 12:43:07 +0000
Subject: [PATCH] complete "nodepend" in source

- mix-up between .ALLSRC and .IMPSRC, compile the right gc.c file
- add explicit targets for pre-generated stuff
---
 gnu/lib/libobjc/Makefile.bsd-wrapper | 18 ++++++++++--------
 gnu/usr.bin/gcc/Makefile.bsd-wrapper |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/lib/libobjc/Makefile.bsd-wrapper b/gnu/lib/libobjc/Makefile.bsd-wrapper
index b2359ccda9d..ccd7c73c4ec 100644
--- a/gnu/lib/libobjc/Makefile.bsd-wrapper
+++ b/gnu/lib/libobjc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.10 2017/06/12 18:49:34 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.11 2017/07/04 12:43:07 espie Exp $
 
 LIB=		objc
 
@@ -56,7 +56,9 @@ includes:
 				$$i $(DESTDIR)/usr/include/objc/$$i; \
 	done
 
-depend: 
+BUILDFIRST = ${GCCOBJDIR}/config.status
+
+${GCCOBJDIR}/config.status depend:
 	cd ${GCCDIR} && exec ${MAKE} -f Makefile.bsd-wrapper config.status target_path tconfig.h
 
 sendmsg.o sendmsg.po sendmsg.so: runtime-info.h
@@ -106,20 +108,20 @@ tags:
 COMPILE.m=${COMPILE.c} -fgnu-runtime
 
 gc.o: gc.c
-	@echo "${COMPILE.c} ${.ALLSRC} -o ${.TARGET}"
-	@${COMPILE.c} ${.ALLSRC}  -o ${.TARGET}.o
+	@echo "${COMPILE.c} ${.IMPSRC} -o ${.TARGET}"
+	@${COMPILE.c} ${.IMPSRC}  -o ${.TARGET}.o
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
 gc.po: gc.c
-	@echo "${COMPILE.c} -p ${.ALLSRC} -o ${.TARGET}"
-	@${COMPILE.c} -p ${.ALLSRC} -o ${.TARGET}.o
+	@echo "${COMPILE.c} -p ${.IMPSRC} -o ${.TARGET}"
+	@${COMPILE.c} -p ${.IMPSRC} -o ${.TARGET}.o
 	@${LD} -X -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
 gc.so: gc.c
-	@echo "${COMPILE.c} ${PICFLAG} -DPIC ${.ALLSRC} -o ${.TARGET}"
-	@${COMPILE.c} ${PICFLAG} -DPIC ${.ALLSRC} -o ${.TARGET}.o
+	@echo "${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}"
+	@${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}.o
 	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
 	@rm -f ${.TARGET}.o
 
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index dd38007234b..db87d62a73b 100644
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.65 2017/06/12 18:49:34 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.66 2017/07/04 12:43:07 espie Exp $
 
 MAN=		gcc.1 cpp.1 gcov.1 protoize.1
 
@@ -147,7 +147,7 @@ clean cleandir:
 	-@if [ -e Makefile ]; then ${MAKE} distclean; fi
 	-rm -f ${CLEANFILES}
 
-depend: config.status
+${MAN}: config.status
 	exec ${MAKE} ${MAKE_FLAGS} generated-manpages
 
 FILES= ${.CURDIR}/gcc/unwind.h
-- 
2.20.1