[Buildroot] [git commit] toolchain-external: simplify previously-broken symbolic links
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Wed Apr 5 19:32:29 UTC 2017
commit: https://git.buildroot.net/buildroot/commit/?id=68bb926626954732066e79d3811081cd4a82d515
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
A previous commit rewrote broken symbolic links in staging, caused by a
non-singular ARCH_LIB_DIR. In this case, the symbolic links are typically
using one or more intermediate directory symlinks, which can be simplified
using the newly introduced simplify_symlink helper.
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire at nokia.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
toolchain/helpers.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 5137b5d..8367a06 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -63,6 +63,8 @@ copy_toolchain_lib_root = \
# components, as links to the current directory are always fine.
# We need to fix the broken links by removing the right amount of ../
# dots from the link destination.
+# Once the link destination is valid again, it can be simplified to
+# remove the dependency on intermediate directory symlinks.
#
# It is possible that ARCH_LIB_DIR does not contain the dynamic loader
# (ld*.so or similar) because it (or the main symlink to it) normally
@@ -126,6 +128,7 @@ copy_toolchain_sysroot = \
LINKTARGET=`readlink $$i` ; \
NEWLINKTARGET=$${LINKTARGET\#$$relpath} ; \
ln -sf $${NEWLINKTARGET} $$i ; \
+ $(call simplify_symlink,$$i,$(STAGING_DIR)) ; \
done ; \
fi ; \
if [ -e $${ARCH_SYSROOT_DIR}/lib/ld*.so ]; then \
More information about the buildroot
mailing list