[Buildroot] [git commit branch/next] Revert "toolchain: handle toolchains with multiple ld*.so.* files"
From: Arnout Vandecappelle (Essensium/Mind) <hidden>
Date: 2021-08-26 22:36:29
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=73f34988bb81f3e9ea188ac49816dcf21d0276af branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next This breaks some existing external toolchains. Since we're very close to a release, don't try to fix it, but instead simply revert. This reverts commit 6f911a17257d945eb3cb5c9c9a966f0e5fca0842. Fixes: http://autobuild.buildroot.net/results/afe/afe44f4b6a3c53e5864cfb10b04529011e72cf5c/ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <redacted> --- toolchain/helpers.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 5ed149d57d..dfb2581ed5 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk@@ -135,8 +135,10 @@ copy_toolchain_sysroot = \ $(call simplify_symlink,$$i,$(STAGING_DIR)) ; \ done ; \ fi ; \ - if ! find -wholename $(STAGING_DIR)'/lib/ld*.so.*' > /dev/null; then \ - find -wholename $${ARCH_SYSROOT_DIR}'/lib/ld*.so.*' -print0 | xargs -0 -I % cp % $(STAGING_DIR)/lib/; \ + if [ ! -e $(STAGING_DIR)/lib/ld*.so.* ]; then \ + if [ -e $${ARCH_SYSROOT_DIR}/lib/ld*.so.* ]; then \ + cp -a $${ARCH_SYSROOT_DIR}/lib/ld*.so.* $(STAGING_DIR)/lib/ ; \ + fi ; \ fi ; \ if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \ if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \
_______________________________________________ buildroot mailing list buildroot@busybox.net http://lists.busybox.net/mailman/listinfo/buildroot