diff options
| author | Yann E. MORIN" <yann.morin.1998@free.fr> | 2014-05-11 17:51:33 +0200 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@free.fr> | 2014-05-11 17:51:33 +0200 |
| commit | 8989b2d65827f36a474cc8fafff5a458b71fc6c5 (patch) | |
| tree | 0fefa618871f6bbe80c4483c0f07a040903bec9e | |
| parent | 298982aab23ffaaecefa8f7f8bcf377063e70b94 (diff) | |
| download | crosstool-ng-8989b2d65827f36a474cc8fafff5a458b71fc6c5.tar.gz crosstool-ng-8989b2d65827f36a474cc8fafff5a458b71fc6c5.tar.bz2 crosstool-ng-8989b2d65827f36a474cc8fafff5a458b71fc6c5.zip | |
binutils/elf2flt: restore the custom location functionality
Somehow, it got lost when incorporating elf2flt in the binutils farmework.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
| -rw-r--r-- | scripts/build/binutils/binutils.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index 4705f54c..b6207bef 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -14,7 +14,12 @@ do_binutils_get() { fi if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then - CT_GetGit elf2flt "${CT_ELF2FLT_GIT_CSET}" git://wh0rd.org/elf2flt.git + if [ "${CT_ELF2FLT_CUSTOM}" = "y" ]; then + CT_GetCustom "elf2flt" "${CT_ELF2FLT_VERSION}" \ + "${CT_ELF2FLT_CUSTOM_LOCATION}" + else + CT_GetGit elf2flt "${CT_ELF2FLT_GIT_CSET}" git://wh0rd.org/elf2flt.git + fi fi } @@ -28,8 +33,11 @@ do_binutils_extract() { fi if [ -n "${CT_ARCH_BINFMT_FLAT}" ]; then - CT_Extract "elf2flt-${CT_ELF2FLT_GIT_CSET}" - CT_Patch "elf2flt" "${CT_ELF2FLT_GIT_CSET}" + if ! [ "${CT_ELF2FLT_CUSTOM}" = "y" \ + -a -d "${CT_SRC_DIR}/elf2flt-${CT_ELF2FLT_VERSION}" ]; then + CT_Extract "elf2flt-${CT_ELF2FLT_GIT_CSET}" + CT_Patch "elf2flt" "${CT_ELF2FLT_GIT_CSET}" + fi fi } |