diff options
author | Alexey Neyman <stilor@att.net> | 2017-07-07 16:08:28 -0700 |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2017-07-08 10:57:57 -0700 |
commit | af479f10530a53861eae1f8a144e87cb012f708f (patch) | |
tree | 7c99270e87007d8652bb456e00e8226dd39fd449 /config/binutils | |
parent | c9b31439db79b325a96b39c3a19a6b9aed347979 (diff) | |
download | crosstool-ng-af479f10530a53861eae1f8a144e87cb012f708f.tar.gz crosstool-ng-af479f10530a53861eae1f8a144e87cb012f708f.tar.bz2 crosstool-ng-af479f10530a53861eae1f8a144e87cb012f708f.zip |
Merge elf2flt into binutils.in
It was previously picked up as "tail options" config file, .in.2.
Now we only have a single config file for each component.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'config/binutils')
-rw-r--r-- | config/binutils/binutils.in | 24 | ||||
-rw-r--r-- | config/binutils/binutils.in.2 | 25 |
2 files changed, 24 insertions, 25 deletions
diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in index 908395d7..3cb58f9e 100644 --- a/config/binutils/binutils.in +++ b/config/binutils/binutils.in @@ -180,3 +180,27 @@ config BINUTILS_FOR_TARGET_BFD default y endif # BINUTILS_FOR_TARGET + +if ARCH_BINFMT_FLAT + +comment "elf2flt" + +config ELF2FLT_REQUIRES + def_bool y + select ZLIB + select BINUTILS_FORCE_LD_BFD_ONLY + +source "config/versions/elf2flt.in" + +config ELF2FLT_EXTRA_CONFIG_ARRAY + string + prompt "elf2flt extra config" + default "" + help + Extra flags passed onto ./configure when configuring + + You can enter multiple arguments here, and arguments can contain spaces + if they are properly quoted (or escaped, but prefer quotes). Eg.: + --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space + +endif # ARCH_BINFMT_FLAT diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2 deleted file mode 100644 index 29ae5435..00000000 --- a/config/binutils/binutils.in.2 +++ /dev/null @@ -1,25 +0,0 @@ -# elf2flt options - -if ARCH_BINFMT_FLAT - -config ELF2FLT_REQUIRES - def_bool y - select ZLIB - select BINUTILS_FORCE_LD_BFD_ONLY - -comment "elf2flt" - -source "config/versions/elf2flt.in" - -config ELF2FLT_EXTRA_CONFIG_ARRAY - string - prompt "elf2flt extra config" - default "" - help - Extra flags passed onto ./configure when configuring - - You can enter multiple arguments here, and arguments can contain spaces - if they are properly quoted (or escaped, but prefer quotes). Eg.: - --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space - -endif # ARCH_BINFMT_FLAT |