From patchwork Tue Jan 14 08:21:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B8rensen=2C_Stefan?= X-Patchwork-Id: 310505 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 05A902C0098 for ; Tue, 14 Jan 2014 19:39:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A0528B681; Tue, 14 Jan 2014 08:39:09 +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 HQotF80NehNC; Tue, 14 Jan 2014 08:39:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 61E8489D87; Tue, 14 Jan 2014 08:39:06 +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 032DE1BFA1B for ; Tue, 14 Jan 2014 08:39:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F11F88A108 for ; Tue, 14 Jan 2014 08:39:04 +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 te2AqWyh4fSX for ; Tue, 14 Jan 2014 08:39:03 +0000 (UTC) X-Greylist: delayed 00:17:14 by SQLgrey-1.7.6 Received: from HORWDSPRD01.spectralink.com (213083164162.static.sonofon.dk [213.83.164.162]) by whitealder.osuosl.org (Postfix) with ESMTP id 2308689879 for ; Tue, 14 Jan 2014 08:39:02 +0000 (UTC) Received: from e37108.spectralink.com ([172.29.194.63]) by HORWDSPRD01.spectralink.com with Microsoft SMTPSVC(7.5.7600.16601); Tue, 14 Jan 2014 09:21:43 +0100 Received: by e37108.spectralink.com (sSMTP sendmail emulation); Tue, 14 Jan 2014 09:21:43 +0100 From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= To: buildroot@busybox.net Date: Tue, 14 Jan 2014 09:21:35 +0100 Message-Id: <1389687696-4824-2-git-send-email-stefan.sorensen@spectralink.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1389687696-4824-1-git-send-email-stefan.sorensen@spectralink.com> References: <1389687696-4824-1-git-send-email-stefan.sorensen@spectralink.com> MIME-Version: 1.0 X-OriginalArrivalTime: 14 Jan 2014 08:21:43.0993 (UTC) FILETIME=[A8B24A90:01CF1101] Subject: [Buildroot] [PATCH 2/3] toolchain-external: Fix ld.so naming with uClibc and EABIhf. 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Currently ld-linux-armhf.so.* is added to external libs when using an EABIhf toolchain, but this naming is not used by uClibc. Fix by adding a check for glibc. Signed-off-by: Stefan Sørensen --- toolchain/toolchain-external/toolchain-external.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 1084ee2..a7bfafc 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -63,7 +63,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) LIB_EXTERNAL_LIBS+=libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.* -ifeq ($(BR2_ARM_EABIHF),y) +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy) LIB_EXTERNAL_LIBS+=ld-linux-armhf.so.* else LIB_EXTERNAL_LIBS+=ld*.so.*