From dd6c79189f2a4461629351dcc488eb71e05283d9 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Thu, 02 May 2019 18:31:21 -0400
Subject: build: Remove more "4.7" strings

---
(limited to 'build')

diff --git a/build b/build
index 465632e..3775e4b 100755
--- a/build
+++ b/build
@@ -123,7 +123,7 @@ $(buildnative_targets):
 	oh-autobuild -B "$(builddir)" -T bootstrap-lean -- -j $${JOBS:-1} \
 		libsubdir="$${libsubdir}" \
 		libexecsubdir="$${libsubdir}" \
-		gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-4.7" \
+		gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)" \
 		libsubincludedir="$${libsubdir}/include" \
 		fincludedir="$${libsubdir}/finclude" \
 		toolexeclibdir="/usr/lib/$(target)" \
@@ -137,7 +137,7 @@ $(buildcross_targets):
 	oh-autobuild -B "$(builddir)" -T all-gcc -- -j $${JOBS:-1} \
 		libsubdir="$${libsubdir}" \
 		libexecsubdir="$${libsubdir}" \
-		gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-4.7" \
+		gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)" \
 		libsubincludedir="$${libsubdir}/include" \
 		fincludedir="$${libsubdir}/finclude" \
 		toolexeclibdir="/usr/lib/$(target)" \
@@ -164,7 +164,7 @@ $(installnative_targets):
 	# See also: <http://gcc.gnu.org/ml/gcc/2013-04/msg00171.html>.
 	libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \
 	oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install -- \
-		host_installdir=/usr/include/$(target)/c++-4.7/bits \
+		host_installdir=/usr/include/$(target)/c++-$(base_version)/bits \
 		libsubdir="$${libsubdir}" \
 		libexecsubdir="$${libsubdir}" \
 		libsubincludedir="$${libsubdir}/include" \
@@ -295,8 +295,8 @@ $(installnative_targets):
 $(installcross_targets):
 	libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \
 	oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install-gcc -- \
-		gxx_include_dir=/usr/include/c++-4.7 \
-		host_installdir=/usr/include/$(target)/c++-4.7/bits \
+		gxx_include_dir=/usr/include/c++-$(base_version) \
+		host_installdir=/usr/include/$(target)/c++-$(base_version)/bits \
 		libsubdir="$${libsubdir}" \
 		libexecsubdir="$${libsubdir}" \
 		libsubincludedir="$${libsubdir}/include" \
--
cgit v0.9.1