From patchwork Thu Jul 16 08:25:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 496833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 714B5140773 for ; Fri, 17 Jul 2015 05:39:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B9709A1CA7; Thu, 16 Jul 2015 19:39:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KsJueKwRDOqR; Thu, 16 Jul 2015 19:39:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4E5E6A30E3; Thu, 16 Jul 2015 19:37:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 591361C21DC for ; Thu, 16 Jul 2015 08:27:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 528B09277C for ; Thu, 16 Jul 2015 08:27:10 +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 fsc9DOkJGlzm for ; Thu, 16 Jul 2015 08:27:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 228B3929D7 for ; Thu, 16 Jul 2015 08:27:08 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 933D544056C; Thu, 16 Jul 2015 11:27:05 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Thu, 16 Jul 2015 11:25:34 +0300 Message-Id: X-Mailer: git-send-email 2.1.4 Subject: [Buildroot] [PATCH] toolchain-external: fix uClibc-ng 64bit dynamic loader link X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" Commit 34f95bf9dbb0 (toolchain-external: fix support of uClibc-ng toolchains, 2015-07-13) added the missing ld-uClibc.so.1 dynamic linker symlink that binaries expect when linked with uClibc-ng. However on 64bit targets the linker is called ld64-uClibc.so.1. Handle that case as well. Signed-off-by: Baruch Siach --- toolchain/toolchain-external/toolchain-external.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index fcb033ca2ebf..ce9d79f2fa41 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -730,6 +730,9 @@ define TOOLCHAIN_EXTERNAL_FIXUP_UCLIBCNG_LDSO if test -e $(TARGET_DIR)/lib/ld-uClibc.so.1; then \ ln -sf ld-uClibc.so.1 $(TARGET_DIR)/lib/ld-uClibc.so.0 ; \ fi + if test -e $(TARGET_DIR)/lib/ld64-uClibc.so.1; then \ + ln -sf ld64-uClibc.so.1 $(TARGET_DIR)/lib/ld64-uClibc.so.0 ; \ + fi endef define TOOLCHAIN_EXTERNAL_INSTALL_STAGING_CMDS