[src/trunk]: src/external/gpl3/gcc/lib/libstdc++-v3 Arrange so that the Makef...

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

details:   https://anonhg.NetBSD.org/src/rev/5ef332c3f127
branches:  trunk
changeset: 458532:5ef332c3f127
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jul 30 20:19:18 2019 +0000

description:
Arrange so that the Makefile works for both the generic and the dragonfly
locale code.

diffstat:

 external/gpl3/gcc/lib/libstdc++-v3/Makefile |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r fa1224fc116f -r 5ef332c3f127 external/gpl3/gcc/lib/libstdc++-v3/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Tue Jul 30 20:18:11 2019 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile       Tue Jul 30 20:19:18 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.47 2019/04/23 20:55:53 christos Exp $
+#      $NetBSD: Makefile,v 1.48 2019/07/30 20:19:18 christos Exp $
 
 REQUIRETOOLS=  yes
 NOLINT=                # defined
@@ -66,6 +66,12 @@
 CPPFLAGS+=     -I${DIST}/libstdc++-v3/include
 CPPFLAGS+=     -I${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}
 CPPFLAGS+=     -D_GLIBCXX_SHARED -DGTHREAD_USE_WEAK -DSUPPORTS_WEAK
+.if ${G_CLOCALE_CC:M*dragonfly*} != ""
+CPPFLAGS+=     -I${CONF}/locale/dragonfly
+LOCALETYPE=    dragonfly
+.else
+LOCALETYPE=    generic
+.endif
 
 # affects profiling; can't switch it off just for profiling easily.
 #CXXFLAGS+=    ${G_SECTION_FLAGS}
@@ -92,6 +98,7 @@
 COPTS.cxx11-wlocale-inst.cc +=-Wno-stack-protector
 COPTS.cxx11-locale-inst.cc +=-Wno-stack-protector
 COPTS.cxx11-wlocale-inst.cc +=-Wno-stack-protector
+COPTS.codecvt_members.cc +=-Wno-stack-protector
 COPTS.compatibility-thread-c++0x.cc += -Wno-deprecated-declarations
 COPTS.concept-inst.cc += -fimplicit-templates
 COPTS.collate_members_cow.cc += -fimplicit-templates
@@ -186,7 +193,7 @@
        ${DIST}/libstdc++-v3/src/filesystem \
        ${DIST}/libstdc++-v3/libsupc++ \
        ${DIST}/libstdc++-v3/config/os/bsd/netbsd \
-       ${CONF}/locale/generic \
+       ${CONF}/locale/${LOCALETYPE} \
        ${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}
 
 ${OBJS}: ${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}/defs.mk