[src/trunk]: src/external/gpl3 Descend and build includes even if mkgcccmds=n...

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

details:   https://anonhg.NetBSD.org/src/rev/2bbf4e5fa8c0
branches:  trunk
changeset: 447604:2bbf4e5fa8c0
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 18 17:31:39 2019 +0000

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

diffstat:

 external/gpl3/gcc.old/Makefile         |  8 ++------
 external/gpl3/gcc.old/usr.bin/Makefile |  7 +++++--
 external/gpl3/gcc/Makefile             |  8 ++------
 external/gpl3/gcc/usr.bin/Makefile     |  7 +++++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diffs (92 lines):

diff -r 6321c5beab7e -r 2bbf4e5fa8c0 external/gpl3/gcc.old/Makefile
--- a/external/gpl3/gcc.old/Makefile    Fri Jan 18 17:30:31 2019 +0000
+++ b/external/gpl3/gcc.old/Makefile    Fri Jan 18 17:31:39 2019 +0000
@@ -1,11 +1,7 @@
-#      $NetBSD: Makefile,v 1.7 2018/11/11 22:49:37 mrg Exp $
-
-SUBDIR+= lib
+#      $NetBSD: Makefile,v 1.8 2019/01/18 17:31:39 christos Exp $
 
 .include <bsd.own.mk>
 
-.if ${MKGCCCMDS} != "no"
-SUBDIR+= .WAIT usr.bin
-.endif
+SUBDIR+= lib .WAIT usr.bin
 
 .include <bsd.subdir.mk>
diff -r 6321c5beab7e -r 2bbf4e5fa8c0 external/gpl3/gcc.old/usr.bin/Makefile
--- a/external/gpl3/gcc.old/usr.bin/Makefile    Fri Jan 18 17:30:31 2019 +0000
+++ b/external/gpl3/gcc.old/usr.bin/Makefile    Fri Jan 18 17:31:39 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2018/11/11 22:50:06 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2019/01/18 17:31:39 christos Exp $
 
 NOOBJ=# defined
 
@@ -8,8 +8,9 @@
 
 .if ${MKGCC} != "no" && exists(${.CURDIR}/gcc/arch/${GCC_MACHINE_ARCH}/defs.mk)
 
+.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 @@
                lto1 lto-wrapper \
                include
 
+.endif
+
 .include <bsd.subdir.mk>
 
 .else
diff -r 6321c5beab7e -r 2bbf4e5fa8c0 external/gpl3/gcc/Makefile
--- a/external/gpl3/gcc/Makefile        Fri Jan 18 17:30:31 2019 +0000
+++ b/external/gpl3/gcc/Makefile        Fri Jan 18 17:31:39 2019 +0000
@@ -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>
diff -r 6321c5beab7e -r 2bbf4e5fa8c0 external/gpl3/gcc/usr.bin/Makefile
--- a/external/gpl3/gcc/usr.bin/Makefile        Fri Jan 18 17:30:31 2019 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile        Fri Jan 18 17:31:39 2019 +0000
@@ -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 @@
 
 .if ${MKGCC} != "no" && exists(${.CURDIR}/gcc/arch/${GCC_MACHINE_ARCH}/defs.mk)
 
+.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 @@
                lto1 lto-wrapper \
                include
 
+.endif
+
 .include <bsd.subdir.mk>
 
 .else