Module Name: src
Committed By: mrg
Date: Fri Aug 23 08:17:28 UTC 2019
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/distrib/sets/lists/man: mi
src/external/gpl3/gcc/lib: Makefile
src/lib: Makefile
src/share/mk: bsd.own.mk
Log Message:
fix MKCXX=no:
- don't build GDB
- don't build sanitizers
- don't build GCC commands
- fix some set lists
To generate a diff of this commit:
cvs rdiff -u -r1.867 -r1.868 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2282 -r1.2283 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.325 -r1.326 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.285 -r1.286 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.225 -r1.226 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.1649 -r1.1650 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.17 -r1.18 src/external/gpl3/gcc/lib/Makefile
cvs rdiff -u -r1.271 -r1.272 src/lib/Makefile
cvs rdiff -u -r1.1150 -r1.1151 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.867 src/distrib/sets/lists/base/shl.mi:1.868
--- src/distrib/sets/lists/base/shl.mi:1.867 Wed Aug 21 13:48:37 2019
+++ src/distrib/sets/lists/base/shl.mi Fri Aug 23 08:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.867 2019/08/21 13:48:37 nakayama Exp $
+# $NetBSD: shl.mi,v 1.868 2019/08/23 08:17:27 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -177,13 +177,13 @@
./usr/lib/libarchive.so base-sys-shlib compatfile
./usr/lib/libarchive.so.4 base-sys-shlib compatfile
./usr/lib/libarchive.so.4.0 base-sys-shlib compatfile
-./usr/lib/libasan.so base-sys-shlib compatfile,gcc
+./usr/lib/libasan.so base-sys-shlib compatfile,cxx,gcc
./usr/lib/libasan.so.2 base-obsolete obsolete
./usr/lib/libasan.so.2.0 base-obsolete obsolete
-./usr/lib/libasan.so.3 base-sys-shlib compatfile,gcc=6
-./usr/lib/libasan.so.3.0 base-sys-shlib compatfile,gcc=6
-./usr/lib/libasan.so.4 base-sys-shlib compatfile,gcc=7
-./usr/lib/libasan.so.4.0 base-sys-shlib compatfile,gcc=7
+./usr/lib/libasan.so.3 base-sys-shlib compatfile,cxx,gcc=6
+./usr/lib/libasan.so.3.0 base-sys-shlib compatfile,cxx,gcc=6
+./usr/lib/libasan.so.4 base-sys-shlib compatfile,cxx,gcc=7
+./usr/lib/libasan.so.4.0 base-sys-shlib compatfile,cxx,gcc=7
./usr/lib/libasn1.so base-krb5-shlib compatfile,kerberos
./usr/lib/libasn1.so.10 base-krb5-shlib compatfile,kerberos
./usr/lib/libasn1.so.10.0 base-krb5-shlib compatfile,kerberos
@@ -385,11 +385,11 @@
./usr/lib/libldap_r.so base-ldap-shlib ldap,compatfile
./usr/lib/libldap_r.so.4 base-ldap-shlib ldap,compatfile
./usr/lib/libldap_r.so.4.3 base-ldap-shlib ldap,compatfile
-./usr/lib/liblsan.so base-sys-shlib compatfile,gcc
-./usr/lib/liblsan.so.1 base-sys-shlib compatfile,gcc=6
-./usr/lib/liblsan.so.1.0 base-sys-shlib compatfile,gcc=6
-./usr/lib/liblsan.so.2 base-sys-shlib compatfile,gcc=7
-./usr/lib/liblsan.so.2.0 base-sys-shlib compatfile,gcc=7
+./usr/lib/liblsan.so base-sys-shlib compatfile,cxx,gcc
+./usr/lib/liblsan.so.1 base-sys-shlib compatfile,cxx,gcc=6
+./usr/lib/liblsan.so.1.0 base-sys-shlib compatfile,cxx,gcc=6
+./usr/lib/liblsan.so.2 base-sys-shlib compatfile,cxx,gcc=7
+./usr/lib/liblsan.so.2.0 base-sys-shlib compatfile,cxx,gcc=7
./usr/lib/liblua.so base-sys-shlib compatfile
./usr/lib/liblua.so.5 base-sys-shlib compatfile
./usr/lib/liblua.so.5.3 base-sys-shlib compatfile
@@ -852,13 +852,13 @@
./usr/lib/libtspi.so base-sys-shlib compatfile,tpm
./usr/lib/libtspi.so.3 base-sys-shlib compatfile,tpm
./usr/lib/libtspi.so.3.0 base-sys-shlib compatfile,tpm
-./usr/lib/libubsan.so base-sys-shlib compatfile,gcc
+./usr/lib/libubsan.so base-sys-shlib compatfile,cxx,gcc
./usr/lib/libubsan.so.1 base-sys-shlib obsolete,gcc=5
./usr/lib/libubsan.so.1.0 base-sys-shlib obsolete,gcc=5
-./usr/lib/libubsan.so.2 base-sys-shlib compatfile,gcc=6
-./usr/lib/libubsan.so.2.0 base-sys-shlib compatfile,gcc=6
-./usr/lib/libubsan.so.3 base-sys-shlib compatfile,gcc=7
-./usr/lib/libubsan.so.3.0 base-sys-shlib compatfile,gcc=7
+./usr/lib/libubsan.so.2 base-sys-shlib compatfile,cxx,gcc=6
+./usr/lib/libubsan.so.2.0 base-sys-shlib compatfile,cxx,gcc=6
+./usr/lib/libubsan.so.3 base-sys-shlib compatfile,cxx,cxx,gcc=7
+./usr/lib/libubsan.so.3.0 base-sys-shlib compatfile,cxx,gcc=7
./usr/lib/libukfs.so base-sys-shlib compatfile,rump
./usr/lib/libukfs.so.1 base-sys-shlib compatfile,rump
./usr/lib/libukfs.so.1.0 base-sys-shlib compatfile,rump
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2282 src/distrib/sets/lists/comp/mi:1.2283
--- src/distrib/sets/lists/comp/mi:1.2282 Thu Aug 15 16:31:17 2019
+++ src/distrib/sets/lists/comp/mi Fri Aug 23 08:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2282 2019/08/15 16:31:17 kamil Exp $
+# $NetBSD: mi,v 1.2283 2019/08/23 08:17:27 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -2584,14 +2584,14 @@
./usr/include/objc/encoding.h comp-obsolete obsolete
./usr/include/objc/hash.h comp-obsolete obsolete
./usr/include/objc/list.h comp-obsolete obsolete
-./usr/include/objc/message.h comp-objc-include libstdcxx,gcc
+./usr/include/objc/message.h comp-objc-include gcc
./usr/include/objc/objc-api.h comp-obsolete obsolete
-./usr/include/objc/objc-decls.h comp-cxx-include gcc,cxx
-./usr/include/objc/objc-exception.h comp-objc-include libstdcxx,gcc
+./usr/include/objc/objc-decls.h comp-objc-include gcc
+./usr/include/objc/objc-exception.h comp-objc-include gcc
./usr/include/objc/objc-list.h comp-obsolete obsolete
-./usr/include/objc/objc-sync.h comp-objc-include libstdcxx,gcc
+./usr/include/objc/objc-sync.h comp-objc-include gcc
./usr/include/objc/objc.h comp-c-include gcc
-./usr/include/objc/runtime.h comp-objc-include libstdcxx,gcc
+./usr/include/objc/runtime.h comp-objc-include gcc
./usr/include/objc/sarray.h comp-obsolete obsolete
./usr/include/objc/thr.h comp-c-include gcc
./usr/include/objc/typedstream.h comp-obsolete obsolete
@@ -3341,8 +3341,8 @@
./usr/lib/libamu_p.a comp-obsolete obsolete
./usr/lib/libarchive.a comp-c-lib compatfile
./usr/lib/libarchive_p.a comp-c-proflib compatfile,profile
-./usr/lib/libasan.a comp-c-lib compatfile,gcc
-./usr/lib/libasan_p.a comp-c-proflib compatfile,profile,gcc
+./usr/lib/libasan.a comp-c-lib compatfile,cxx,gcc
+./usr/lib/libasan_p.a comp-c-proflib compatfile,profile,cxx,gcc
./usr/lib/libasn1.a comp-krb5-lib compatfile,kerberos
./usr/lib/libasn1_p.a comp-krb5-proflib compatfile,kerberos,profile
./usr/lib/libatf-c++.a comp-atf-lib compatfile,atf
@@ -3496,8 +3496,8 @@
./usr/lib/libldap_p.a comp-ldap-proflib compatfile,ldap,profile
./usr/lib/libldap_r.a comp-ldap-lib compatfile,ldap
./usr/lib/libldap_r_p.a comp-ldap-proflib compatfile,ldap,profile
-./usr/lib/liblsan.a comp-c-lib compatfile,gcc
-./usr/lib/liblsan_p.a comp-c-proflib compatfile,profile,gcc
+./usr/lib/liblsan.a comp-c-lib compatfile,cxx,gcc
+./usr/lib/liblsan_p.a comp-c-proflib compatfile,profile,cxx,gcc
./usr/lib/liblua.a comp-c-lib compatfile
./usr/lib/liblua_p.a comp-c-proflib compatfile,profile
./usr/lib/liblutok.a comp-c-lib compatfile,kyua
@@ -3825,8 +3825,8 @@
./usr/lib/libtre_p.a comp-c-proflib compatfile,profile
./usr/lib/libtspi.a comp-c-lib compatfile,tpm
./usr/lib/libtspi_p.a comp-c-proflib compatfile,tpm,profile
-./usr/lib/libubsan.a comp-c-lib compatfile,gcc
-./usr/lib/libubsan_p.a comp-c-proflib compatfile,profile,gcc
+./usr/lib/libubsan.a comp-c-lib compatfile,cxx,gcc
+./usr/lib/libubsan_p.a comp-c-proflib compatfile,profile,cxx,gcc
./usr/lib/libukfs.a comp-c-lib compatfile,rump
./usr/lib/libukfs_p.a comp-c-proflib compatfile,rump,profile
./usr/lib/libumem.a comp-zfs-lib compatfile,zfs
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.325 src/distrib/sets/lists/comp/shl.mi:1.326
--- src/distrib/sets/lists/comp/shl.mi:1.325 Tue Mar 12 15:10:44 2019
+++ src/distrib/sets/lists/comp/shl.mi Fri Aug 23 08:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.325 2019/03/12 15:10:44 christos Exp $
+# $NetBSD: shl.mi,v 1.326 2019/08/23 08:17:27 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -7,7 +7,7 @@
./usr/lib/crtendS.o comp-c-lib compatfile
./usr/lib/libamu_pic.a comp-obsolete obsolete
./usr/lib/libarchive_pic.a comp-c-piclib compatfile,picinstall
-./usr/lib/libasan_pic.a comp-c-piclib compatfile,picinstall,gcc
+./usr/lib/libasan_pic.a comp-c-piclib compatfile,picinstall,cxx,gcc
./usr/lib/libasn1_pic.a comp-c-piclib compatfile,picinstall,kerberos
./usr/lib/libatf-c++_pic.a comp-atf-piclib compatfile,picinstall,atf
./usr/lib/libatf-c_pic.a comp-atf-piclib compatfile,picinstall,atf
@@ -47,7 +47,7 @@
./usr/lib/libform_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libg++_pic.a comp-obsolete obsolete
./usr/lib/libg2c_pic.a comp-obsolete obsolete
-./usr/lib/libgcc_eh.a comp-c-lib compatfile,gcccmds
+./usr/lib/libgcc_eh.a comp-c-lib compatfile,gcc
./usr/lib/libgcc_eh_p.a comp-obsolete obsolete
./usr/lib/libgcc_eh_pic.a comp-obsolete obsolete
./usr/lib/libgcc_pic.a comp-obsolete obsolete
@@ -84,7 +84,7 @@
./usr/lib/liblber_pic.a comp-ldap-piclib compatfile,picinstall,ldap
./usr/lib/libldap_pic.a comp-ldap-piclib compatfile,picinstall,ldap
./usr/lib/libldap_r_pic.a comp-ldap-piclib compatfile,picinstall,ldap
-./usr/lib/liblsan_pic.a comp-c-piclib compatfile,picinstall,gcc
+./usr/lib/liblsan_pic.a comp-c-piclib compatfile,picinstall,cxx,gcc
./usr/lib/liblua_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/liblutok_pic.a comp-c-piclib compatfile,picinstall,kyua
./usr/lib/liblwres_pic.a comp-obsolete obsolete
@@ -265,7 +265,7 @@
./usr/lib/libtpm_unseal_pic.a comp-tpm-lib compatfile,picinstall,tpm
./usr/lib/libtre_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libtspi_pic.a comp-c-piclib compatfile,picinstall,tpm
-./usr/lib/libubsan_pic.a comp-c-piclib compatfile,picinstall,gcc
+./usr/lib/libubsan_pic.a comp-c-piclib compatfile,picinstall,cxx,gcc
./usr/lib/libukfs_pic.a comp-c-piclib compatfile,picinstall,rump
./usr/lib/libumem_pic.a comp-zfs-piclib compatfile,picinstall,zfs
./usr/lib/libunbound_pic.a comp-c-piclib compatfile,picinstall,unbound
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.285 src/distrib/sets/lists/debug/mi:1.286
--- src/distrib/sets/lists/debug/mi:1.285 Sun Jul 28 13:49:22 2019
+++ src/distrib/sets/lists/debug/mi Fri Aug 23 08:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.285 2019/07/28 13:49:22 christos Exp $
+# $NetBSD: mi,v 1.286 2019/08/23 08:17:27 mrg Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -26,7 +26,7 @@
./usr/lib/i18n/libmapper_zone_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libamu_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libarchive_g.a comp-c-debuglib debuglib,compatfile
-./usr/lib/libasan_g.a comp-c-debuglib debuglib,compatfile,gcc
+./usr/lib/libasan_g.a comp-c-debuglib debuglib,compatfile,cxx,gcc
./usr/lib/libasn1_g.a comp-c-debuglib debuglib,compatfile,kerberos
./usr/lib/libatf-c++_g.a comp-c-debuglib debuglib,compatfile,atf
./usr/lib/libatf-c_g.a comp-c-debuglib debuglib,compatfile,atf
@@ -96,7 +96,7 @@
./usr/lib/liblber_g.a comp-c-debuglib debuglib,ldap,compatfile
./usr/lib/libldap_g.a comp-c-debuglib debuglib,ldap,compatfile
./usr/lib/libldap_r_g.a comp-c-debuglib debuglib,ldap,compatfile
-./usr/lib/liblsan_g.a comp-c-debuglib debuglib,compatfile,gcc
+./usr/lib/liblsan_g.a comp-c-debuglib debuglib,compatfile,cxx,gcc
./usr/lib/liblua_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/liblwres_g.a comp-obsolete obsolete
./usr/lib/liblzf_g.a comp-c-debuglib debuglib,compatfile
@@ -255,7 +255,7 @@
./usr/lib/libtpm_unseal_g.a comp-c-debuglib debuglib,compatfile,tpm
./usr/lib/libtre_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libtspi_g.a comp-c-debuglib debuglib,compatfile,tpm
-./usr/lib/libubsan_g.a comp-c-debuglib debuglib,compatfile,gcc
+./usr/lib/libubsan_g.a comp-c-debuglib debuglib,compatfile,cxx,gcc
./usr/lib/libukfs_g.a comp-c-debuglib debuglib,compatfile,rump
./usr/lib/libumem_g.a comp-c-debuglib debuglib,compatfile,zfs
./usr/lib/libunbound_g.a comp-c-debuglib debuglib,compatfile,unbound
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.225 src/distrib/sets/lists/debug/shl.mi:1.226
--- src/distrib/sets/lists/debug/shl.mi:1.225 Mon Jul 1 07:57:01 2019
+++ src/distrib/sets/lists/debug/shl.mi Fri Aug 23 08:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.225 2019/07/01 07:57:01 martin Exp $
+# $NetBSD: shl.mi,v 1.226 2019/08/23 08:17:27 mrg Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
@@ -57,8 +57,8 @@
./usr/libdata/debug/usr/lib/i18n/libmapper_zone.so.5.0.debug comp-i18n-debug debug,compatfile
./usr/libdata/debug/usr/lib/libamu.so.5.0.debug comp-amd-debug debug,compatfile
./usr/libdata/debug/usr/lib/libarchive.so.4.0.debug comp-sys-debug debug,compatfile
-./usr/libdata/debug/usr/lib/libasan.so.3.0.debug comp-sys-debug debug,compatfile,gcc=6
-./usr/libdata/debug/usr/lib/libasan.so.4.0.debug comp-sys-debug debug,compatfile,gcc=7
+./usr/libdata/debug/usr/lib/libasan.so.3.0.debug comp-sys-debug debug,compatfile,cxx,gcc=6
+./usr/libdata/debug/usr/lib/libasan.so.4.0.debug comp-sys-debug debug,compatfile,cxx,gcc=7
./usr/libdata/debug/usr/lib/libasn1.so.10.0.debug comp-krb5-debug debug,compatfile,kerberos
./usr/libdata/debug/usr/lib/libatf-c++.so.2.0.debug comp-atf-debug debug,compatfile,atf
./usr/libdata/debug/usr/lib/libatf-c.so.0.0.debug comp-atf-debug debug,compatfile,atf
@@ -134,8 +134,8 @@
./usr/libdata/debug/usr/lib/liblber.so.3.3.debug comp-ldap-debug debug,compatfile,ldap
./usr/libdata/debug/usr/lib/libldap.so.4.3.debug comp-ldap-debug debug,compatfile,ldap
./usr/libdata/debug/usr/lib/libldap_r.so.4.3.debug comp-ldap-debug debug,compatfile,ldap
-./usr/libdata/debug/usr/lib/liblsan.so.1.0.debug comp-sys-debug debug,compatfile,gcc=6
-./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug comp-sys-debug debug,compatfile,gcc=7
+./usr/libdata/debug/usr/lib/liblsan.so.1.0.debug comp-sys-debug debug,compatfile,cxx,gcc=6
+./usr/libdata/debug/usr/lib/liblsan.so.2.0.debug comp-sys-debug debug,compatfile,cxx,gcc=7
./usr/libdata/debug/usr/lib/liblua.so.5.3.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/liblutok.so.1.0.debug comp-obsolete debug,compatfile,obsolete
./usr/libdata/debug/usr/lib/liblutok.so.2.0.debug comp-kyua-debug debug,compatfile,kyua
@@ -290,8 +290,8 @@
./usr/libdata/debug/usr/lib/libtre.so.0.8.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libtspi.so.3.0.debug comp-tpm-debug debug,compatfile,tpm
./usr/libdata/debug/usr/lib/libubsan.so.1.0.debug comp-sys-debug obsolete,gcc=5
-./usr/libdata/debug/usr/lib/libubsan.so.2.0.debug comp-sys-debug debug,compatfile,gcc=6
-./usr/libdata/debug/usr/lib/libubsan.so.3.0.debug comp-sys-debug debug,compatfile,gcc=7
+./usr/libdata/debug/usr/lib/libubsan.so.2.0.debug comp-sys-debug debug,compatfile,cxx,gcc=6
+./usr/libdata/debug/usr/lib/libubsan.so.3.0.debug comp-sys-debug debug,compatfile,cxx,gcc=7
./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug comp-sys-debug debug,compatfile,rump
./usr/libdata/debug/usr/lib/libumem.so.0.0.debug comp-zfs-debug debug,compatfile,zfs
./usr/libdata/debug/usr/lib/libunbound.so.6.2.debug comp-net-debug debug,compatfile,unbound
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1649 src/distrib/sets/lists/man/mi:1.1650
--- src/distrib/sets/lists/man/mi:1.1649 Thu Jul 25 00:02:56 2019
+++ src/distrib/sets/lists/man/mi Fri Aug 23 08:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1649 2019/07/25 00:02:56 rmind Exp $
+# $NetBSD: mi,v 1.1650 2019/08/23 08:17:27 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2525,8 +2525,8 @@
./usr/share/man/cat8/evbarm/bootmini2440.0 man-sysutil-catman .cat
./usr/share/man/cat8/evbarm/elftosb.0 man-sysutil-catman .cat,cxx
./usr/share/man/cat8/evbarm/makedev.0 man-obsolete obsolete
-./usr/share/man/cat8/evbarm/sbkeygen.0 man-sysutil-catman .cat
-./usr/share/man/cat8/evbarm/sbtool.0 man-sysutil-catman .cat
+./usr/share/man/cat8/evbarm/sbkeygen.0 man-sysutil-catman .cat,cxx
+./usr/share/man/cat8/evbarm/sbtool.0 man-sysutil-catman .cat,cxx
./usr/share/man/cat8/evbmips/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/evbmips/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/evbppc/MAKEDEV.0 man-obsolete obsolete
@@ -5543,8 +5543,8 @@
./usr/share/man/html8/etcupdate.html man-sysutil-htmlman html
./usr/share/man/html8/evbarm/bootmini2440.html man-sysutil-htmlman html
./usr/share/man/html8/evbarm/elftosb.html man-sysutil-htmlman html,cxx
-./usr/share/man/html8/evbarm/sbkeygen.html man-sysutil-htmlman html
-./usr/share/man/html8/evbarm/sbtool.html man-sysutil-htmlman html
+./usr/share/man/html8/evbarm/sbkeygen.html man-sysutil-htmlman html,cxx
+./usr/share/man/html8/evbarm/sbtool.html man-sysutil-htmlman html,cxx
./usr/share/man/html8/extattrctl.html man-sysutil-htmlman html
./usr/share/man/html8/faithd.html man-router-htmlman inet6,html
./usr/share/man/html8/fastboot.html man-sysutil-htmlman html
@@ -8634,8 +8634,8 @@
./usr/share/man/man8/evbarm/bootmini2440.8 man-sysutils-man .man
./usr/share/man/man8/evbarm/elftosb.8 man-sysutil-man .man,cxx
./usr/share/man/man8/evbarm/makedev.8 man-obsolete obsolete
-./usr/share/man/man8/evbarm/sbkeygen.8 man-sysutil-man .man
-./usr/share/man/man8/evbarm/sbtool.8 man-sysutil-man .man
+./usr/share/man/man8/evbarm/sbkeygen.8 man-sysutil-man .man,cxx
+./usr/share/man/man8/evbarm/sbtool.8 man-sysutil-man .man,cxx
./usr/share/man/man8/evbmips/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/evbmips/makedev.8 man-obsolete obsolete
./usr/share/man/man8/evbppc/MAKEDEV.8 man-obsolete obsolete
Index: src/external/gpl3/gcc/lib/Makefile
diff -u src/external/gpl3/gcc/lib/Makefile:1.17 src/external/gpl3/gcc/lib/Makefile:1.18
--- src/external/gpl3/gcc/lib/Makefile:1.17 Thu Jun 28 14:01:12 2018
+++ src/external/gpl3/gcc/lib/Makefile Fri Aug 23 08:17:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/06/28 14:01:12 kre Exp $
+# $NetBSD: Makefile,v 1.18 2019/08/23 08:17:26 mrg Exp $
.include <bsd.own.mk>
@@ -10,8 +10,8 @@ SUBDIR+= liblto_plugin
.if (${MKLIBSTDCXX} != "no") && (${MKCXX} != "no")
SUBDIR+= libsupc++ libstdc++-v3
-.endif
SUBDIR+= .WAIT libasan liblsan libubsan
+.endif
.include <bsd.subdir.mk>
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.271 src/lib/Makefile:1.272
--- src/lib/Makefile:1.271 Fri May 10 09:42:46 2019
+++ src/lib/Makefile Fri Aug 23 08:17:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.271 2019/05/10 09:42:46 nakayama Exp $
+# $NetBSD: Makefile,v 1.272 2019/08/23 08:17:26 mrg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -177,11 +177,13 @@ SUBDIR+= ../external/bsd/llvm/include
#==================== 2nd library dependency barrier ====================
SUBDIR+= .WAIT
+.if (${MKGCC} != "no" && ${MKCXX} != "no" && ${MKLIBSTDCXX} != "no")
.for sanitizer in asan lsan ubsan
.if exists(../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/lib${sanitizer})
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/lib${sanitizer}
.endif
.endfor
+.endif
.if (${MKLLVMRT} != "no" && (!defined(MLIBDIR) || ${MKCOMPATX11} != "no"))
SUBDIR+= ../external/bsd/llvm/librt
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1150 src/share/mk/bsd.own.mk:1.1151
--- src/share/mk/bsd.own.mk:1.1150 Sat Aug 10 12:20:17 2019
+++ src/share/mk/bsd.own.mk Fri Aug 23 08:17:27 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1150 2019/08/10 12:20:17 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1151 2019/08/23 08:17:27 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1245,6 +1245,8 @@ MKXORG_SERVER=yes
.if ${MKCXX} == "no"
MKATF:= no
+MKGCCCMDS:= no
+MKGDB:= no
MKGROFF:= no
MKKYUA:= no
.endif
