Module Name:    src
Committed By:   christos
Date:           Fri Jan 18 17:31:55 UTC 2019

Modified Files:
        src/external/gpl3/gcc: Makefile
        src/external/gpl3/gcc/usr.bin: Makefile

Log Message:
Descend and build includes even if mkgcccmds=no because we need the header
files during cross build too.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/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/Makefile
diff -u src/external/gpl3/gcc/Makefile:1.2 src/external/gpl3/gcc/Makefile:1.3
--- src/external/gpl3/gcc/Makefile:1.2	Sun Jan  4 20:52:23 2015
+++ src/external/gpl3/gcc/Makefile	Fri Jan 18 12:31:55 2019
@@ -1,11 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2015/01/05 01:52:23 mrg Exp $
-
-SUBDIR+= lib
+#	$NetBSD: Makefile,v 1.3 2019/01/18 17:31:55 christos Exp $
 
 .include <bsd.own.mk>
 
-.if ${MKGCCCMDS} != "no"
-SUBDIR+= .WAIT usr.bin
-.endif
+SUBDIR+= lib .WAIT usr.bin
 
 .include <bsd.subdir.mk>

Index: src/external/gpl3/gcc/usr.bin/Makefile
diff -u src/external/gpl3/gcc/usr.bin/Makefile:1.10 src/external/gpl3/gcc/usr.bin/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/Makefile:1.10	Sat Feb 10 21:12:28 2018
+++ src/external/gpl3/gcc/usr.bin/Makefile	Fri Jan 18 12:31:55 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2018/02/11 02:12:28 christos Exp $
+#	$NetBSD: Makefile,v 1.11 2019/01/18 17:31:55 christos Exp $
 
 NOOBJ=# defined
 
@@ -8,8 +8,9 @@ GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5
 
 .if ${MKGCC} != "no" && exists(${.CURDIR}/gcc/arch/${GCC_MACHINE_ARCH}/defs.mk)
 
-# We keep libcpp here since it depends upon frontend.
+.if ${MKGCCCMDS} != "no" || make(includes)
 
+# We keep libcpp here since it depends upon frontend.
 SUBDIR+=	host-libiberty .WAIT \
 		host-libcpp .WAIT \
 		backend .WAIT \
@@ -20,6 +21,8 @@ SUBDIR+=	host-libiberty .WAIT \
 		lto1 lto-wrapper \
 		include
 
+.endif
+
 .include <bsd.subdir.mk>
 
 .else

Reply via email to