summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/cc
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2017-06-23 11:54:23 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2017-06-23 11:54:23 +0000
commit496fd0ace975f625c799c9a15b036697205b48dd (patch)
treec0d10b877004d56ba2c48adbf15fee94fcf20f24 /gnu/usr.bin/cc
parenta5eb755723cc1631d6374b710195138d69d5db0f (diff)
Always include Makefile.dep, conditionally including it based on the
existence of a .depend file can lead to various problems. The logic before rev 1.15 resulted in Makefile.dep always being included as DEPENDSFILE was never set so this returns to the old behaviour. ok espie@
Diffstat (limited to 'gnu/usr.bin/cc')
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 6ee5afcf63d..120f2d5675b 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.88.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.15 2017/06/21 00:10:23 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2017/06/23 11:54:22 jsg Exp $
.include <bsd.own.mk>
@@ -533,9 +533,7 @@ CLEANFILES+= ${GENSRCS} ${GENONLY} ${GENOBJS} ${GNTOOLS}
#-----------------------------------------------------------------------
# Manual dependencies.
-.if !exists(.depend)
.include "Makefile.dep"
-.endif
.include <bsd.prog.mk>
# DO NOT DELETE