From ca7ab821625de0781455993546af173a298c6199 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Wed, 9 Sep 2020 04:52:32 +0000
Subject: [PATCH] consolidate a bunch of libstdc++ variable collection.

---
 tools/gcc/mknative-gcc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/gcc/mknative-gcc b/tools/gcc/mknative-gcc
index 681061f9b6a3..35d4285c9d80 100755
--- a/tools/gcc/mknative-gcc
+++ b/tools/gcc/mknative-gcc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.110 2020/09/08 19:17:24 mrg Exp $
+#	$NetBSD: mknative-gcc,v 1.111 2020/09/09 04:52:32 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -226,12 +226,14 @@ get_libstdcxx_v3 () {
 	mkdir -p $_OUTDIR/lib/$_subdir/arch/$_MACHINE_ARCH
 
 	_build_headers="c++config.h cxxabi_tweaks.h"
-	_headers1="c_base_headers_extra_install"
+	_headers1="backward_headers c_base_headers_extra c_base_headers_extra_install"
 	_headers1="$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install"
-	_headers1="$_headers1 debug_headers parallel_headers pstl_headers"
-	_headers2="host_headers thread_host_headers"
-	_pf_headers="profile_headers profile_impl_headers"
-	_pb_headers="pb_headers1 pb_headers2 pb_headers3 pb_headers4 pb_headers5 pb_headers6 pb_headers7"
+	_headers1="$_headers1 debug_headers parallel_headers"
+	_headers1="$_headers1 pb_headers1 pb_headers2 pb_headers3 pb_headers4"
+	_headers1="$_headers1 pb_headers5 pb_headers6 pb_headers7"
+	# These subdirs get the subdir removed from the values.
+	_headers2="bits_headers ext_headers host_headers thread_host_headers pstl_headers"
+	_headers2="$_headers2 profile_headers profile_impl_headers"
 
 	# build files
 	for h in $_build_headers; do
@@ -286,13 +288,11 @@ get_libstdcxx_v3 () {
 
 		# includes
 		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
-			backward_headers c_base_headers_extra $_headers1 $_pb_headers | \
+			$_headers1 | \
 				sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g'
 		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
-			bits_headers ext_headers $_headers2 | \
-				sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g' -e 's#\${GNUHOSTDIST}/libstdc++-v3/config/##g'
-		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
-			$_pf_headers | sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/profile/##g'
+			$_headers2 | \
+				sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/[^/][^/]*/##g'
 		getvars $_PLATFORM/libstdc++-v3/include/Makefile \
 			BASIC_FILE_H ALLOCATOR_H CSTDIO_H CLOCALE_H CMESSAGES_H CTIME_H
 	} | sanitise_includes \