From patchwork Wed Jul 8 05:34:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 492730 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7DB981402BD for ; Wed, 8 Jul 2015 15:34:37 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4512A283F62; Wed, 8 Jul 2015 07:34:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 40A0C2800E7 for ; Wed, 8 Jul 2015 07:34:10 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mout.web.de (mout.web.de [212.227.15.3]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 8 Jul 2015 07:34:10 +0200 (CEST) Received: from [192.168.3.157] ([91.64.206.38]) by smtp.web.de (mrweb001) with ESMTPSA (Nemesis) id 0LshGz-1Z1tJC1r4b-012KYi for ; Wed, 08 Jul 2015 07:34:27 +0200 To: OpenWrt Development List From: Dirk Neukirchen Message-ID: <559CB656.8040205@web.de> Date: Wed, 8 Jul 2015 07:34:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 X-Provags-ID: V03:K0:7Z04osPzjXZbBoGKUlehOCUVDrwJOobZes1ukFevZ9lTtEMBgY7 qmaYIpFPZULTYAGOTxb3CuZMcCOoTp8MVHaEycPu7dnuX7rVYrnDZV8uuE0UpwD2wFqNqsY XfA/cEUCBDKONFMA+WmwKCIYLavJXRw4BpE0Xzp1HpeoNZ2b2KgPwx82hya1vHMpbCNoSLa 3z4Ct81DkwgEnI7kT7sxg== X-UI-Out-Filterresults: notjunk:1; V01:K0:PQccqGvmrtk=:SY7iqPxOhOQ2pNKDZULJ61 pGt8EpI5IlsEot5oOi/LO9wM7GkGjxbmxN6oUFNaHl1QebVDIm/4oxgu3qVyt8p0SO44hk3wA z7cX0gYW5dD0EKIBNKYwAHpE2mPfeQTvF0ll7KuJLZdFDK0o1rDy7dJ893XkL6wP4CoAZ0hOb S4LJkpkV+KtqDcWu24dJEleBvb/VXzzvt1xkO9055hK/5VYTDpVMyD4VsRRtjd75h5RVt61yy Us7mWWvEwHzWCC2PyOsEks0xNwctD6teG1zEqTvqZTqxwR70c8LBKEZdb4my6Yp/nS/Wb7Nq5 Dpy4JXvefKPnNMJZdlSlLC3N1MaHGPsw66CkjzSo1tEy7m4qHc8REiBOpTZQFIIXd1oHSuIsc fFXFhQ4mv1XGT37xZAVqnYHIpOA/UHr76F8ouvcGdoVWR5J77p3WTenz/IOXisvd6ThZBHJNd FlpXcEsQcGS6J7C+5EUR/449cNYhvMNift/bwhTJ78McbOGkkFeOS18JUgLt2XfP1rk05Aql8 cKQMi2YS/zoqRnzE+F6m+bxSfM4tOm/JK2sO9fngM6EiDUEwztoKuom8ixXdGC81MwBjMzMg5 tHvBlNAmk58BjOI7/GWOIUyKcqAQU1DKpgqLIdNVf9qfZyplcDLI6btOKRmjI7EvpvG7Okt8/ fo0/5Bncya/BjvxRLh5IgXAaiT8/zwPgcTeO3lXwPKjXYrRXpNDFyH2dAml/BukhHNoE= Subject: [OpenWrt-Devel] [PATCH] fix 64bit uclibc external toolchain detection X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" according to gcc, UCLIBC_DYNAMIC_LINKER64 Signed-off-by: Dirk Neukirchen --- scripts/ext-toolchain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh index 3ebaa21..a552fbe 100755 --- a/scripts/ext-toolchain.sh +++ b/scripts/ext-toolchain.sh @@ -91,7 +91,7 @@ test_uclibc() { local sysroot="$("$CC" $CFLAGS -print-sysroot 2>/dev/null)" if [ -d "${sysroot:-$TOOLCHAIN}" ]; then local lib - for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld-uClibc*.so*; do + for lib in "${sysroot:-$TOOLCHAIN}"/{lib,usr/lib,usr/local/lib}/ld*-uClibc*.so*; do if [ -f "$lib" ] && [ ! -h "$lib" ]; then return 0 fi