[src/trunk]: src/external/gpl3/gcc/usr.bin/cpp - use ADD_FRONTEND_LIBRARY to ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6753082d44ef
branches:  trunk
changeset: 838824:6753082d44ef
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Feb 01 10:36:33 2019 +0000

description:
- use ADD_FRONTEND_LIBRARY to avoid linking libfrontend
- add a hack to ensure driver-i386.c gets built before linking

diffstat:

 external/gpl3/gcc/usr.bin/cpp/Makefile |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r 2ba193c6a737 -r 6753082d44ef external/gpl3/gcc/usr.bin/cpp/Makefile
--- a/external/gpl3/gcc/usr.bin/cpp/Makefile    Fri Feb 01 10:35:09 2019 +0000
+++ b/external/gpl3/gcc/usr.bin/cpp/Makefile    Fri Feb 01 10:36:33 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2016/03/15 19:12:06 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2019/02/01 10:36:33 mrg Exp $
 
 PROG=          cpp
 SRCS=          cppspec.c ${G_GCC_OBJS:.o=.c}
@@ -18,7 +18,11 @@
 LDADD+=                -lintl
 DPADD+=                ${LIBINTL}
 
+.include <bsd.own.mk>
+
+ADD_FRONTEND_LIBRARY=  no
 .include "../Makefile.frontend"
+.include "../Makefile.driver"
 
 ${SRCS}: ${GCCARCH}/defs.mk
 
@@ -29,3 +33,6 @@
 .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}