[src/trunk]: src/external/gpl3/gcc/lib/libstdc++-v3 find header files in /usr...

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

details:   https://anonhg.NetBSD.org/src/rev/37705f00dd43
branches:  trunk
changeset: 938259:37705f00dd43
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Sep 05 12:19:25 2020 +0000

description:
find header files in /usr/include/gcc-9 and the gcc cpu dir.

diffstat:

 external/gpl3/gcc/dist/gcc/config/netbsd.h  |  2 +-
 external/gpl3/gcc/lib/libstdc++-v3/Makefile |  5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 60e06c837c21 -r 37705f00dd43 external/gpl3/gcc/dist/gcc/config/netbsd.h
--- a/external/gpl3/gcc/dist/gcc/config/netbsd.h        Sat Sep 05 11:40:56 2020 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/netbsd.h        Sat Sep 05 12:19:25 2020 +0000
@@ -63,7 +63,7 @@
  * XXX figure out a better way to do this
  */
 #undef GCC_INCLUDE_DIR
-#define GCC_INCLUDE_DIR "/usr/include/gcc-8"
+#define GCC_INCLUDE_DIR "/usr/include/gcc-9"
 
 /* Under NetBSD, the normal location of the various *crt*.o files is the
    /usr/lib directory.  */
diff -r 60e06c837c21 -r 37705f00dd43 external/gpl3/gcc/lib/libstdc++-v3/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Sat Sep 05 11:40:56 2020 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Sat Sep 05 12:19:25 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.49 2020/09/05 09:50:15 mrg Exp $
+#      $NetBSD: Makefile,v 1.50 2020/09/05 12:19:25 mrg Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -62,8 +62,11 @@
 
 SRCS=          ${LIBSUPCXXSRCS} ${LIBSTDCXXSRCS}
 
+GCC_MACHINE_SUBDIR=${MACHINE_CPU:C/powerpc.*/rs6000/:C/x86_64/i386/}
+
 CXXFLAGS+=     -fno-implicit-templates
 CPPFLAGS+=     -I${DIST}/libstdc++-v3/include
+CPPFLAGS+=     -I${DIST}/gcc/config/${GCC_MACHINE_SUBDIR}
 CPPFLAGS+=     -I${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}
 CPPFLAGS+=     -D_GLIBCXX_SHARED -DGTHREAD_USE_WEAK -DSUPPORTS_WEAK
 .if ${G_CLOCALE_CC:M*dragonfly*} != ""