diff mbox

[v2] toolchain/external:: Fix gdbserver install with linaro 2015.08

Message ID 1446754352.4553.10.camel@rtred1test09.kymeta.local
State Accepted
Headers show

Commit Message

Trent Piepho Nov. 5, 2015, 8:12 p.m. UTC
It's now in bin/gdbserver from the install dir of the toolchain.

Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com>
---
 toolchain/toolchain-external/toolchain-external.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Yann E. MORIN Nov. 5, 2015, 8:29 p.m. UTC | #1
Trent, All,

On 2015-11-05 20:12 +0000, Trent Piepho spake thusly:
> It's now in bin/gdbserver from the install dir of the toolchain.

You could have said:

    In the latest Linaro toolchain, the gdbserver has moved (surprise!)
    and is now located side-by-side with the toolchain executables.

    And this path as a new location where to search for a gdbserver.

    Note: wrapping the long line at the same time.

;-)

> Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com>

Otherwise:

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  toolchain/toolchain-external/toolchain-external.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
> index 958ab18..613ce50 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 ; \
> -- 
> 1.8.3.1
> 
>
Thomas Petazzoni Nov. 5, 2015, 10:25 p.m. UTC | #2
Dear Trent Piepho,

On Thu, 5 Nov 2015 20:12:32 +0000, Trent Piepho wrote:
> It's now in bin/gdbserver from the install dir of the toolchain.
> 
> Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com>
> ---
>  toolchain/toolchain-external/toolchain-external.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Applied after tweaking the commit title and commit log, in part using
the suggestion from Yann E. Morin.

See:

   http://git.buildroot.net/buildroot/commit/?id=d7a92aa2fbe1cfd13c8d0bf7c7942b2ead747ffe

for the final commit.

Thanks a lot for this contribution!

Thomas
diff mbox

Patch

diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 958ab18..613ce50 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 ; \