From 066fd9017fd9a325dbf6575c9f068ab939863608 Mon Sep 17 00:00:00 2001 From: "vicencb@gmail.com" Date: Sun, 27 Sep 2015 14:48:22 +0100 Subject: [PATCH] toolchain-external: fix musl-based builds on ARMhf platforms When ARCH is arm and the hard-floating-point option is on executables expect to find the dynamic linker at /lib/ld-musl-armhf.so.1 and not /lib/ld-musl-arm.so.1. This patch adjusts the logic that creates the symbolic link from the dynamic linker path to the musl C library (since musl has everything built into a single file). [Thomas: tweak the commit log.] Signed-off-by: Vicente Bergas Signed-off-by: Thomas Petazzoni --- toolchain/toolchain-external/toolchain-external.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk index 61a5dba182..79afdaab3f 100644 --- a/toolchain/toolchain-external/toolchain-external.mk +++ b/toolchain/toolchain-external/toolchain-external.mk @@ -524,6 +524,8 @@ endef ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y) ifeq ($(BR2_i386),y) MUSL_ARCH = i386 +else ifeq ($(BR2_ARM_EABIHF),y) +MUSL_ARCH = armhf else MUSL_ARCH = $(ARCH) endif -- 2.30.2