summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-10-29 20:54:00 (GMT)
committer Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-10-30 18:10:06 (GMT)
commitb3e3d5fc28b26291d48adad96e92e27c86183673 (patch)
tree6cc0514d70ef3bfd928dfffdb8abfd2114b1d0a8
parent1690fca4648347979d00512891982e4eed74b843 (diff)
downloadbuildroot-b3e3d5fc28b26291d48adad96e92e27c86183673.tar.gz
buildroot-b3e3d5fc28b26291d48adad96e92e27c86183673.tar.bz2
toolchain-external: add missing symlink for Linaro toolchains
In 11ec38b6950 ("toolchain-external: fix Linaro ARM toolchain support"), we fixed the support for Linaro EABIhf toolchains by adding a /lib/arm-linux-gnueabihf -> /lib symbolic link. This is needed because the dynamic loader looks for libraries in /lib/arm-linux-gnueabihf rather than the usual /lib, but Buildroot installs all libraries in /lib. However, we forgot that the dynamic loader also loads libraries from /usr/lib/arm-linux-gnueabihf rather than /usr/lib, so this patch fixes that by adding the necessary symbolic link. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reported-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r--toolchain/toolchain-external/toolchain-external.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index d658d4f..668e9c3 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -229,10 +229,11 @@ TOOLCHAIN_EXTERNAL_WRAPPER_ARGS += -DBR_SOFTFLOAT=1
endif
# The Linaro ARMhf toolchain expects the libraries in
-# /lib/arm-linux-gnueabihf, but Buildroot copies them to /lib, so we
-# need to create a symbolic link.
+# {/usr,}/lib/arm-linux-gnueabihf, but Buildroot copies them to
+# {/usr,}/lib, so we need to create a symbolic link.
define TOOLCHAIN_EXTERNAL_LINARO_ARMHF_SYMLINK
ln -sf . $(TARGET_DIR)/lib/arm-linux-gnueabihf
+ ln -sf . $(TARGET_DIR)/usr/lib/arm-linux-gnueabihf
endef
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201109),y)