aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Trent Piepho <tpiepho@kymetacorp.com>2015-11-05 20:12:32 +0000
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-11-05 23:21:38 +0100
commitd7a92aa2fbe1cfd13c8d0bf7c7942b2ead747ffe (patch)
tree20f7d44d615f142761c3bb5e48cd578ce0685011
parentb56ad1efe8218e8bbd45492868f49d5332f2d8c4 (diff)
downloadbuildroot-d7a92aa2fbe1cfd13c8d0bf7c7942b2ead747ffe.tar.gz
buildroot-d7a92aa2fbe1cfd13c8d0bf7c7942b2ead747ffe.tar.bz2
toolchain/external: fix gdbserver install with Linaro 2015.08
In the latest Linaro toolchain, the gdbserver has moved (surprise!) and is now located side-by-side with the toolchain executables. This commit adds this path as a new location where to search for a gdbserver, and while at it wraps the line that has become too long in the process. [Thomas: rework commit log according to Yann's suggestion.] Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--toolchain/toolchain-external/toolchain-external.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 958ab183c2..613ce50660 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -645,7 +645,10 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \
$(call MESSAGE,"Copying gdbserver") ; \
gdbserver_found=0 ; \
- for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ; do \
+ for d in $${ARCH_SYSROOT_DIR}/usr \
+ $${ARCH_SYSROOT_DIR}/../debug-root/usr \
+ $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \
+ $(TOOLCHAIN_EXTERNAL_INSTALL_DIR); do \
if test -f $${d}/bin/gdbserver ; then \
install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \
gdbserver_found=1 ; \