diff options
author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-25 04:40:44 (GMT) |
---|---|---|
committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-25 04:40:44 (GMT) |
commit | 3c072d620652780a4ae7a7823f6e9a1a6b699a15 (patch) | |
tree | f24d31f770225d6574628a0844d4bd70416faae5 /scripts | |
parent | c4a1428ab3a654214514c4311a1f388910300764 (diff) |
binutils/gdb: Fix configure options when building from binutils-gdb repo
When building from:
{git,http}://sourceware.org/git/binutils-gdb.git
and setting BINUTILS_CUSTOM or GDB_CUSTOM, they could be the same
source.
These config options should not affect normal released versions.
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/build/binutils/binutils.sh | 4 | ||||
-rw-r--r-- | scripts/build/debug/300-gdb.sh | 15 |
2 files changed, 19 insertions, 0 deletions
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh index 50c7741..a84e654 100644 --- a/scripts/build/binutils/binutils.sh +++ b/scripts/build/binutils/binutils.sh @@ -211,6 +211,10 @@ do_binutils_backend() { extra_config+=("--disable-multilib") fi + # Disable gdb when building from the binutils-gdb repository. + extra_config+=("--disable-sim") + extra_config+=("--disable-gdb") + [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ] && extra_config+=("--disable-nls") CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'" diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 8d3c46d..beef5ff 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -100,6 +100,11 @@ do_debug_gdb_build() { LD_for_gdb="${CT_HOST}-ld -static" fi + # Disable binutils options when building from the binutils-gdb repo. + cross_extra_config+=("--disable-binutils") + cross_extra_config+=("--disable-ld") + cross_extra_config+=("--disable-gas") + CT_DoLog DEBUG "Extra config passed: '${cross_extra_config[*]}'" CT_DoExecLog CFG \ @@ -186,6 +191,11 @@ do_debug_gdb_build() { export ac_cv_func_strncmp_works=yes + # Disable binutils options when building from the binutils-gdb repo. + native_extra_config+=("--disable-binutils") + native_extra_config+=("--disable-ld") + native_extra_config+=("--disable-gas") + CT_DoLog DEBUG "Extra config passed: '${native_extra_config[*]}'" CT_DoExecLog CFG \ @@ -251,6 +261,11 @@ do_debug_gdb_build() { fi fi + # Disable binutils options when building from the binutils-gdb repo. + gdbserver_extra_config+=("--disable-binutils") + gdbserver_extra_config+=("--disable-ld") + gdbserver_extra_config+=("--disable-gas") + CT_DoExecLog CFG \ CC="${CT_TARGET}-gcc" \ CPP="${CT_TARGET}-cpp" \ |