From 8ee3bcc7ea1eea5aa97c0b30b8a8fb2ff9182bd7 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 13 May 2019 23:17:52 -0400
Subject: build: Set gcc_gxx_tool_include_dir

---
(limited to 'build')

diff --git a/build b/build
index 4c80dbf..3a51bbf 100755
--- a/build
+++ b/build
@@ -63,6 +63,10 @@ bootstrap1_opts = \
 	--disable-libgomp \
 	--disable-libssp
 
+dir_macros = \
+	user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)" \
+	gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)"
+
 extra_opts =
 native_target = bootstrap-lean
 cross_target = all-gcc
@@ -128,7 +132,7 @@ $(build_targets): configure
 $(buildnative_targets):
 	oh-autobuild -B "$(builddir)" -T $(native_target) -- \
 		-j $${JOBS:-$(jobs)} \
-		user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
+		$(dir_macros)
 	#if [ '$(OPK_BUILD_ARCH)' = '$(OPK_HOST_ARCH)' ]; then \
 	#	cd "$(builddir)" && make -k check; \
 	#fi
@@ -136,7 +140,7 @@ $(buildnative_targets):
 $(buildcross_targets):
 	oh-autobuild -B "$(builddir)" -T $(cross_target) -- \
 		-j $${JOBS:-$(jobs)} \
-		user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
+		$(dir_macros)
 
 build: $(build_targets)
 	touch $@
@@ -158,7 +162,7 @@ $(installnative_targets):
 	#     is specified.
 	# See also: <http://gcc.gnu.org/ml/gcc/2013-04/msg00171.html>.
 	oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install -- \
-		user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
+		$(dir_macros)
 	# Change the target architecture prefix of files in /usr/bin.
 	rm -f $(destdir)/usr/bin/$(target_gnu)-*
 	for f in $(destdir)/usr/bin/*; do f="$${f##*/}"; \
@@ -255,7 +259,7 @@ $(installnative_targets):
 
 $(installcross_targets):
 	oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install-gcc -- \
-		user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
+		$(dir_macros)
 	# Change the target architecture prefix of files in /usr/bin.
 	rm -f $(destdir)/usr/bin/$(target_gnu)-*
 	for f in $(destdir)/usr/bin/*; do f="$${f##*/}"; \
--
cgit v0.9.1