From a8573869492a24e6d3f14cf709912f87ebe0aeca Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 13 May 2019 22:36:48 -0400
Subject: build: Replace dir macros with user_tooldir_prefix

This completes commit a8671f4.
---
diff --git a/build b/build
index 7bdbb41..0981163 100755
--- a/build
+++ b/build
@@ -258,16 +258,8 @@ $(installnative_targets):
 	oh-installfiles -d "$(destdir)"
 
 $(installcross_targets):
-	libsubdir="/usr/lib/$(target)/gcc-$(base_version)" && \
 	oh-autoinstall -B "$(builddir)" -d "$(destdir)" -T install-gcc -- \
-		gxx_include_dir=/usr/include/c++-$(base_version) \
-		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/$(target_gnu)-*
 	for f in $(destdir)/usr/bin/*; do f="$${f##*/}"; \
--
cgit v0.9.1