diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-19 01:49:56 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-19 01:49:56 (EDT) |
| commit | eeb94df813117715457b3169f22868a339fb59fc (patch) | |
| tree | 7888d633f43608ece80ca23c00dd692b862d07c2 | |
| parent | 69076cdc61b585cf9c051f7728bb2cbfbddc5fa5 (diff) | |
Revert "build, targets.d/*.mk: Don't edit MULTILIB_OSDIRNAMES"
This reverts commit 8ae6e901b08b3136349bbcaef806c7afbd0fe759.
| -rwxr-xr-x | build | 3 | ||||
| -rw-r--r-- | targets.d/amd64-linux-glibc.mk | 2 | ||||
| -rw-r--r-- | targets.d/i686-linux-glibc.mk | 2 |
3 files changed, 7 insertions, 0 deletions
@@ -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 |