Module Name: src
Committed By: christos
Date: Tue Jul 30 20:19:18 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
Log Message:
Arrange so that the Makefile works for both the generic and the dragonfly
locale code.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 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/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.47 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.48
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.47 Tue Apr 23 16:55:53 2019
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Tue Jul 30 16:19:18 2019
@@ -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 @@ CXXFLAGS+= -fno-implicit-templates
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.snprintf_lite.cc += -Wno-stack-pro
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 @@ COPTS.${f}.cc+= -fimplicit-templates ${G
${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
