build: Post-process arch-dependent C++ headers

1 files changed, 5 insertions, 1 deletions

diff --git a/build b/build
index fddd9b6..9a1c771 100755
--- a/build
+++ b/build
@@ -67,10 +67,11 @@ bootstrap1_opts = \
 libdir    = $(destdir)/usr/lib/$(OPK_HOST_ARCH)
 gcclibdir = $(destdir)/usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)
 tgtlibdir = $(destdir)/usr/lib/$(OPK_HOST_ARCH)/$(target)/gcc-$(base_version)
+tgtincdir = /usr/include/$(target)/c++-$(base_version)
 libsuffix = $$(g++ -print-multi-os-directory)
 dir_macros = \
 	user_tooldir_prefix=$(tgtlibdir) \
-	gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)"
+	gcc_gxx_tool_include_dir=$(tgtincdir)
 
 extra_opts =
 native_target = bootstrap-lean
@@ -182,6 +183,9 @@ $(installnative_targets):
 	mv $(libdir)/gcc/$(target_gnu)/$(version)/* $(tgtlibdir)
 	mkdir -p $(gcclibdir)
 	mv $(libdir)/$(libsuffix)/* $(gcclibdir)
+	mkdir -p $(destdir)$(tgtincdir)
+	mv $(destdir)/usr/include/c++-$(base_version)/$(target_gnu)/* \
+		$(destdir)$(tgtincdir)
 	# Remove libquadmath files.
 	rm -f $(gcclibdir)/libquadmath.*
 	# Remove libtool archives and static libraries.