From patchwork Sun Apr 7 10:04:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 234469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 5C9F72C0099 for ; Sun, 7 Apr 2013 20:06:21 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F41F28BDE7; Sun, 7 Apr 2013 10:06:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c3A2TnqX8ZmF; Sun, 7 Apr 2013 10:06:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C1FC08BB94; Sun, 7 Apr 2013 10:05:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8348B8F753 for ; Sun, 7 Apr 2013 10:05:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BF02D8BB2D for ; Sun, 7 Apr 2013 10:05:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t4jYPu2sJAkt for ; Sun, 7 Apr 2013 10:05:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [94.23.35.102]) by whitealder.osuosl.org (Postfix) with ESMTP id 168AE8B17F for ; Sun, 7 Apr 2013 10:05:06 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id BC5BB7B3; Sun, 7 Apr 2013 12:05:05 +0200 (CEST) Received: from localhost (humanoidz.org [82.247.183.72]) by mail.free-electrons.com (Postfix) with ESMTPSA id 28B38162F for ; Sun, 7 Apr 2013 12:04:54 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 7 Apr 2013 12:04:36 +0200 Message-Id: <1365329076-19853-5-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1365329076-19853-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1365329076-19853-1-git-send-email-thomas.petazzoni@free-electrons.com> Subject: [Buildroot] [PATCHv4 4/4] toolchain-external: support more gdbserver locations X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The x86/x86-64 CodeSourcery toolchains use some weird locations for the gdbserver binary: $ find . -name 'gdbserver' ./i686-pc-linux-gnu/libc/atom/usr/bin/gdbserver ./i686-pc-linux-gnu/libc/atom/usr/lib/bin/gdbserver ./i686-pc-linux-gnu/libc/core2/usr/bin/gdbserver ./i686-pc-linux-gnu/libc/core2/usr/lib64/bin/gdbserver ./i686-pc-linux-gnu/libc/usr/lib/bin/gdbserver ./i686-pc-linux-gnu/libc/usr/lib64/bin/gdbserver Notice that it's sometimes hidden in a usr/{lib,lib64}/bin directory. This patch changes the gdbserver logic to also try in this location. Originally based on work done by Daniel Nilsson, visible at http://patchwork.ozlabs.org/patch/155767/. Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/ext-tool.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index 5f467b7..911527c 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -444,9 +444,9 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked if test x"$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" == x"y"; then \ $(call MESSAGE,"Copying gdbserver") ; \ gdbserver_found=0 ; \ - for d in $${ARCH_SYSROOT_DIR} $${ARCH_SYSROOT_DIR}/../debug-root/ ; do \ - if test -f $${d}/usr/bin/gdbserver ; then \ - install -m 0755 -D $${d}/usr/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \ + for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ; do \ + if test -f $${d}/bin/gdbserver ; then \ + install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \ gdbserver_found=1 ; \ break ; \ fi ; \