3 files changed, 8 insertions, 3 deletions
diff --git a/gnu/usr.bin/cc/libcpp/Makefile b/gnu/usr.bin/cc/libcpp/Makefile
index 9e80648a19f..1ffae80ab50 100644
--- a/gnu/usr.bin/cc/libcpp/Makefile
+++ b/gnu/usr.bin/cc/libcpp/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cc/libcpp/Makefile,v 1.1.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.2 2009/10/15 21:08:01 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2017/06/16 10:25:54 espie Exp $
 
 # Use our headers in preference to ones from ../cc_tools.
 CFLAGS+=	-I${.CURDIR} -I.
@@ -19,6 +19,8 @@ SRCS+=	charset.c directives.c errors.c expr.c files.c \
 NOPROFILE=	Yes
 NOPIC=		Yes
 
+BUILDFIRST =	localedir.h
+
 localedir.h:	Makefile
 	echo	'#define LOCALEDIR "/usr/share/locale"' > localedir.h
 SRCS+=		localedir.h
diff --git a/gnu/usr.bin/cc/libgcov/Makefile b/gnu/usr.bin/cc/libgcov/Makefile
index 0d24bf9e822..d6b155db871 100644
--- a/gnu/usr.bin/cc/libgcov/Makefile
+++ b/gnu/usr.bin/cc/libgcov/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/lib/libgcov/Makefile,v 1.6 2009/06/21 01:54:47 kan Exp $
-# $OpenBSD: Makefile,v 1.2 2013/05/18 18:21:39 miod Exp $
+# $OpenBSD: Makefile,v 1.3 2017/06/16 10:25:54 espie Exp $
 
 .include <bsd.own.mk>
 
@@ -71,6 +71,8 @@ CLEANFILES += ${COMMONHDRS}
 CLEANFILES += cs-*.h option*
 
 ${OBJS} beforedepend: ${COMMONHDRS}
+BUILDFIRST = ${COMMONHDRS}
+BUILDAFTER += ${OBJS_T} ${OBJS_P} ${OBJS_S}
 
 ${OBJS_T}: libgcov.c
 	${CC_T} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
diff --git a/gnu/usr.bin/cc/libobjc/Makefile b/gnu/usr.bin/cc/libobjc/Makefile
index 1119c7ce4be..c01ba349e89 100644
--- a/gnu/usr.bin/cc/libobjc/Makefile
+++ b/gnu/usr.bin/cc/libobjc/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/lib/libobjc/Makefile,v 1.34.2.1 2009/08/03 08:13:06 kensmith Exp $
-# $OpenBSD: Makefile,v 1.5 2017/02/15 21:22:53 miod Exp $
+# $OpenBSD: Makefile,v 1.6 2017/06/16 10:25:54 espie Exp $
 
 OBJCDIR=${.CURDIR}/../../../gcc/libobjc
 GCCDIR=	${.CURDIR}/../../../gcc/gcc
@@ -51,6 +51,7 @@ includes: ${INCS}
 .endif
 
 ${OBJS}: ${GENHDRS}
+BUILDFIRST = ${GENHDRS}
 
 .include <bsd.lib.mk>