From a8671f48c972ad0e7ae3555d0efae1ad2413fa2a Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sun, 12 May 2019 16:08:10 -0400
Subject: build: Replace dir macros with user_tooldir_prefix

---
diff --git a/build b/build
index 3775e4b..8c61353 100755
--- a/build
+++ b/build
@@ -119,29 +119,15 @@ $(build_targets): configure
 	touch $@
 
 $(buildnative_targets):
-	libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \
 	oh-autobuild -B "$(builddir)" -T bootstrap-lean -- -j $${JOBS:-1} \
-		libsubdir="$${libsubdir}" \
-		libexecsubdir="$${libsubdir}" \
-		gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)" \
-		libsubincludedir="$${libsubdir}/include" \
-		fincludedir="$${libsubdir}/finclude" \
-		toolexeclibdir="/usr/lib/$(target)" \
-		MULTIOSDIR=.
+		user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
 	#if [ '$(OPK_BUILD_ARCH)' = '$(OPK_HOST_ARCH)' ]; then \
 	#	cd "$(builddir)" && make -k check; \
 	#fi
 
 $(buildcross_targets):
-	libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \
 	oh-autobuild -B "$(builddir)" -T all-gcc -- -j $${JOBS:-1} \
-		libsubdir="$${libsubdir}" \
-		libexecsubdir="$${libsubdir}" \
-		gcc_gxx_tool_include_dir="/usr/include/$(target)/c++-$(base_version)" \
-		libsubincludedir="$${libsubdir}/include" \
-		fincludedir="$${libsubdir}/finclude" \
-		toolexeclibdir="/usr/lib/$(target)" \
-		MULTIOSDIR=.
+		user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
 
 build: $(build_targets)
 	touch $@
@@ -162,15 +148,8 @@ $(installnative_targets):
 	#   * GNU Make executes any commands that contain "$(MAKE)", even if -n
 	#     is specified.
 	# 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++-$(base_version)/bits \
-		libsubdir="$${libsubdir}" \
-		libexecsubdir="$${libsubdir}" \
-		libsubincludedir="$${libsubdir}/include" \
-		fincludedir="$${libsubdir}/finclude" \
-		toolexeclibdir="/usr/lib/$(target)" \
-		MULTIOSDIR=.
+		user_tooldir_prefix="/usr/lib/$(target)/gcc-$(base_version)"
 	# Change the target architecture prefix of files in /usr/bin.
 	rm -f $(destdir)/usr/bin/*-gcc-$(base_version).*
 	for f in c++ g++ gcc gcc-ar gcc-nm gcc-ranlib; do \
--
cgit v0.9.1