Module Name: src
Committed By: snj
Date: Mon Oct 9 17:59:16 UTC 2017
Modified Files:
src/tools/gcc [netbsd-8]: Makefile mknative-gcc
Log Message:
Apply patch (requested by christos in ticket #312):
disable dual libstdc++ abi
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.81.4.1 src/tools/gcc/Makefile
cvs rdiff -u -r1.89 -r1.89.6.1 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.81 src/tools/gcc/Makefile:1.81.4.1
--- src/tools/gcc/Makefile:1.81 Wed Mar 22 23:11:10 2017
+++ src/tools/gcc/Makefile Mon Oct 9 17:59:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2017/03/22 23:11:10 chs Exp $
+# $NetBSD: Makefile,v 1.81.4.1 2017/10/09 17:59:16 snj Exp $
.include <bsd.own.mk>
@@ -35,6 +35,7 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
--with-pkgversion="NetBSD ${NETBSD_GCC_VERSION}" \
--with-system-zlib \
+ --disable-libstdcxx-dual-abi \
--enable-__cxa_atexit \
--enable-libstdcxx-time=rt \
--enable-libstdcxx-threads
@@ -190,6 +191,7 @@ NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
--disable-symvers \
--disable-libstdcxx-pch \
+ --disable-libstdcxx-dual-abi \
--build=`${GCCDIST}/config.guess` \
--host=${MACHINE_GNU_PLATFORM} \
--with-sysroot=${DESTDIR}
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.89 src/tools/gcc/mknative-gcc:1.89.6.1
--- src/tools/gcc/mknative-gcc:1.89 Wed Oct 5 19:25:49 2016
+++ src/tools/gcc/mknative-gcc Mon Oct 9 17:59:16 2017
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.89 2016/10/05 19:25:49 christos Exp $
+# $NetBSD: mknative-gcc,v 1.89.6.1 2017/10/09 17:59:16 snj Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -380,7 +380,7 @@ __EOF__
# special transforms
for f in gtyp-input.list; do
- sed -e 's/^.*external\/gpl3\/gcc\/dist/SRCDIR/' < $_TMPDIR/gcc/$f > $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
+ sed -e "s@^.*$_OUTDIRBASE/dist@SRCDIR@" < $_TMPDIR/gcc/$f > $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
done
# special platforms
