From 8ae6e901b08b3136349bbcaef806c7afbd0fe759 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 18 May 2019 20:01:10 -0400
Subject: build, targets.d/*.mk: Don't edit MULTILIB_OSDIRNAMES

---
diff --git a/build b/build
index 0479c14..411ee36 100755
--- a/build
+++ b/build
@@ -130,7 +130,6 @@ build-gcc-config:
 		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)"
 	printf '\nMULTIARCH_DIRNAME = %s\n' "$(target)" >>"$(tm)/$(tmake_file)"
 
 build-native: build-gcc-config
diff --git a/targets.d/amd64-linux-glibc.mk b/targets.d/amd64-linux-glibc.mk
index 6a5589b..8732341 100644
--- a/targets.d/amd64-linux-glibc.mk
+++ b/targets.d/amd64-linux-glibc.mk
@@ -1,5 +1,4 @@
 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 324e14b..dc2a20b 100644
--- a/targets.d/i686-linux-glibc.mk
+++ b/targets.d/i686-linux-glibc.mk
@@ -1,5 +1,4 @@
 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