Module Name: src
Committed By: mrg
Date: Sat Sep 5 12:19:25 UTC 2020
Modified Files:
src/external/gpl3/gcc/dist/gcc/config: netbsd.h
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
Log Message:
find header files in /usr/include/gcc-9 and the gcc cpu dir.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/external/gpl3/gcc/dist/gcc/config/netbsd.h
cvs rdiff -u -r1.49 -r1.50 src/external/gpl3/gcc/lib/libstdc++-v3/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/dist/gcc/config/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.34 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.35
--- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.34 Sat Sep 5 09:12:24 2020
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h Sat Sep 5 12:19:25 2020
@@ -63,7 +63,7 @@ along with GCC; see the file COPYING3.
* 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. */
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.49 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.50
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.49 Sat Sep 5 09:50:15 2020
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Sat Sep 5 12:19:25 2020
@@ -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 @@ SUBDIR= include
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*} != ""
