From eeb94df813117715457b3169f22868a339fb59fc Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sun, 19 May 2019 01:49:56 -0400
Subject: Revert "build, targets.d/*.mk: Don't edit MULTILIB_OSDIRNAMES"

This reverts commit 8ae6e901b08b3136349bbcaef806c7afbd0fe759.
---
diff --git a/build b/build
index cc320f1..f1e3e09 100755
--- a/build
+++ b/build
@@ -131,6 +131,9 @@ build-gcc-config:
 		STANDARD_LIBEXEC_PREFIX "$(gccexedir)/" >>"$(tm)/$(tm_file)"
 	printf '#define %s ""\n' STANDARD_STARTFILE_PREFIX_1 \
 		STANDARD_STARTFILE_PREFIX_2 >>"$(tm)/$(tm_file)"
+	[ -e "$(tm)/$(tmake_file).orig" ] || \
+		mv "$(tm)/$(tmake_file)" "$(tm)/$(tmake_file).orig"
+	sed "$(tmake_script)" "$(tm)/$(tmake_file).orig" >"$(tm)/$(tmake_file)"
 
 build-native: build-gcc-config
 	oh-autobuild -B "$(builddir)" -T $(native_target) -- \
diff --git a/targets.d/amd64-linux-glibc.mk b/targets.d/amd64-linux-glibc.mk
index a541aa7..6a5589b 100644
--- a/targets.d/amd64-linux-glibc.mk
+++ b/targets.d/amd64-linux-glibc.mk
@@ -1,3 +1,5 @@
 tm_file = i386/linux64.h
 tm_interp_macro = GLIBC_DYNAMIC_LINKER64
+tmake_file = i386/t-linux64
+tmake_script = s|\(m64=.*\):x86_64-linux-gnu|\1:amd64-linux-glibc|
 target_opts =
diff --git a/targets.d/i686-linux-glibc.mk b/targets.d/i686-linux-glibc.mk
index c51708b..324e14b 100644
--- a/targets.d/i686-linux-glibc.mk
+++ b/targets.d/i686-linux-glibc.mk
@@ -1,3 +1,5 @@
 tm_file = i386/linux.h
 tm_interp_macro = GLIBC_DYNAMIC_LINKER
+tmake_file = i386/t-linux
+tmake_script =
 target_opts = --with-arch=i686 --with-tune=i686
--
cgit v0.9.1