diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-18 17:46:55 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-05-18 17:46:55 (EDT) |
| commit | 420be76028fbfaaf8611149922f543f2e4ef1cbb (patch) | |
| tree | 18053e14ed25afdf3d4c78c117ccd7304b429ff0 | |
| parent | 86d7a2d255a85859fbbb9e2097d4e77b88b7394c (diff) | |
build, targets.d/*.mk: Shorten gcc config macro names
| -rwxr-xr-x | build | 26 | ||||
| -rw-r--r-- | targets.d/amd64-linux-glibc.mk | 8 | ||||
| -rw-r--r-- | targets.d/i686-linux-glibc.mk | 8 |
3 files changed, 21 insertions, 21 deletions
@@ -108,21 +108,21 @@ build-gcc-config: # These commands run once per target, but they modify files in the src/ # directory that other targets might also use, so backups are made. set -e; \ - [ -e "src/gcc/config/$(gcc_config_file).orig" ] || \ - mv "src/gcc/config/$(gcc_config_file)" \ - "src/gcc/config/$(gcc_config_file).orig"; \ - define_pattern=".define $(gcc_config_interp_macro)"; \ + [ -e "src/gcc/config/$(tm_file).orig" ] || \ + mv "src/gcc/config/$(tm_file)" \ + "src/gcc/config/$(tm_file).orig"; \ + define_pattern=".define $(tm_interp_macro)"; \ sed "s|^\($${define_pattern}\) \".*\"$$|\1 \"$(elf_interp)\"|" \ - "src/gcc/config/$(gcc_config_file).orig" \ - >"src/gcc/config/$(gcc_config_file)"; \ - [ -e "src/gcc/config/$(gcc_config_fragment).orig" ] || \ - mv "src/gcc/config/$(gcc_config_fragment)" \ - "src/gcc/config/$(gcc_config_fragment).orig"; \ - sed "$(gcc_config_fragment_script)" \ - "src/gcc/config/$(gcc_config_fragment).orig" \ - >"src/gcc/config/$(gcc_config_fragment)"; \ + "src/gcc/config/$(tm_file).orig" \ + >"src/gcc/config/$(tm_file)"; \ + [ -e "src/gcc/config/$(tmake_file).orig" ] || \ + mv "src/gcc/config/$(tmake_file)" \ + "src/gcc/config/$(tmake_file).orig"; \ + sed "$(tmake_script)" \ + "src/gcc/config/$(tmake_file).orig" \ + >"src/gcc/config/$(tmake_file)"; \ printf '\nMULTIARCH_DIRNAME = %s\n' "$(target)" \ - >>"src/gcc/config/$(gcc_config_fragment)" + >>"src/gcc/config/$(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 0bfed2a..6a5589b 100644 --- a/targets.d/amd64-linux-glibc.mk +++ b/targets.d/amd64-linux-glibc.mk @@ -1,5 +1,5 @@ -gcc_config_file = i386/linux64.h -gcc_config_interp_macro = GLIBC_DYNAMIC_LINKER64 -gcc_config_fragment = i386/t-linux64 -gcc_config_fragment_script = s|\(m64=.*\):x86_64-linux-gnu|\1:amd64-linux-glibc| +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 44a3a47..324e14b 100644 --- a/targets.d/i686-linux-glibc.mk +++ b/targets.d/i686-linux-glibc.mk @@ -1,5 +1,5 @@ -gcc_config_file = i386/linux.h -gcc_config_interp_macro = GLIBC_DYNAMIC_LINKER -gcc_config_fragment = i386/t-linux -gcc_config_fragment_script = +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 |