Module Name:    src
Committed By:   mrg
Date:           Tue Mar 15 19:14:47 UTC 2016

Modified Files:
        src/external/gpl3/gcc/usr.bin: Makefile Makefile.inc
Added Files:
        src/external/gpl3/gcc/usr.bin/host-libcpp: Makefile

Log Message:
build a host version of libcpp, same as we do for libiberty.
the new genmatch generator program needs libcpp.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/Makefile
cvs rdiff -u -r1.25 -r1.26 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/host-libcpp/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/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.7 src/external/gpl3/gcc/usr.bin/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/Makefile:1.7	Wed Jan  7 02:18:10 2015
+++ src/external/gpl3/gcc/usr.bin/Makefile	Tue Mar 15 19:14:47 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2015/01/07 02:18:10 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2016/03/15 19:14:47 mrg Exp $
 
 NOOBJ=# defined
 
@@ -11,6 +11,7 @@ GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5
 # We keep libcpp here since it depends upon frontend.
 
 SUBDIR+=	host-libiberty .WAIT \
+		host-libcpp .WAIT \
 		backend .WAIT \
 		frontend .WAIT \
 		common common-target .WAIT \

Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.25 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.26
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.25	Sun Jul 27 04:16:09 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc	Tue Mar 15 19:14:47 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.25 2014/07/27 04:16:09 dholland Exp $
+#	$NetBSD: Makefile.inc,v 1.26 2016/03/15 19:14:47 mrg Exp $
 
 .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
 _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -41,6 +41,9 @@ BUILD_PREFIX=	${C_BUILD_PREFIX}
 HOSTLIBIBERTYOBJ!=	cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR}
 HOSTLIBIBERTY=		${HOSTLIBIBERTYOBJ}/libiberty/libiberty.a
 
+HOSTLIBCPPOBJ!=		cd ${.CURDIR}/../host-libcpp && ${PRINTOBJDIR}
+HOSTLIBCPP=		${HOSTLIBCPPOBJ}/libcpp/libcpp.a
+
 BASEVER!=		cat ${GNUHOSTDIST}/gcc/BASE-VER
 .if exists(${GNUHOSTDIST}/gcc/DEV-PHASE)
 DEVPHASE!=		cat ${GNUHOSTDIST}/gcc/DEV-PHASE

Added files:

Index: src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile
diff -u /dev/null src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile:1.1
--- /dev/null	Tue Mar 15 19:14:47 2016
+++ src/external/gpl3/gcc/usr.bin/host-libcpp/Makefile	Tue Mar 15 19:14:47 2016
@@ -0,0 +1,18 @@
+#	$NetBSD: Makefile,v 1.1 2016/03/15 19:14:47 mrg Exp $
+
+libcpp/libcpp.a:
+	[ ! -d libcpp ] && mkdir libcpp || true
+	(cd libcpp; \
+		CC=${HOST_CC:Q} \
+		CFLAGS=${HOST_CFLAGS:Q} \
+		MAKE=${TOOL_GMAKE:Q} \
+		CONFIG_SHELL=${HOST_SH:Q} \
+		${HOST_SH} ${DIST}/libcpp/configure \
+		&& CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} ${TOOL_GMAKE})
+
+cleandir:
+	-rm -rf libcpp
+
+depend dependall all: libcpp/libcpp.a
+
+.include <bsd.prog.mk>

Reply via email to