Module Name: src
Committed By: mrg
Date: Sat Feb 9 07:32:50 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin/cpp: Makefile
Log Message:
make sure Makefile.inc is included before Makefile.driver.
allows removing a depend hack and may also fix dtrace/ctf builds.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/cpp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.10 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.10 Fri Feb 1 10:36:33 2019
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Sat Feb 9 07:32:50 2019
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2019/02/01 10:36:33 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/02/09 07:32:50 mrg Exp $
+
+.include <bsd.init.mk>
PROG= cpp
SRCS= cppspec.c ${G_GCC_OBJS:.o=.c}
+.include "../Makefile.driver"
.include "../Makefile.target-defines"
COPTS+= -Wno-stack-protector
@@ -18,11 +21,8 @@ INFOFLAGS= -I${DIST}/gcc/doc -I${DIST}/g
LDADD+= -lintl
DPADD+= ${LIBINTL}
-.include <bsd.own.mk>
-
ADD_FRONTEND_LIBRARY= no
.include "../Makefile.frontend"
-.include "../Makefile.driver"
${SRCS}: ${GCCARCH}/defs.mk
@@ -33,6 +33,3 @@ COPTS.gcc.c= -Wno-stack-protector
.PATH: ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/doc
cpp.info: gcc-vers.texi
-
-# XXX - driver-i386.o isn't built otherwise
-${PROG}: ${OBJS}
