Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v3 1/1] toolchain: handle toolchains with multiple ld*.so.* files
@ 2021-08-26 19:34 Jonah Petri
  2021-08-29 17:21 ` Arnout Vandecappelle
  0 siblings, 1 reply; 5+ messages in thread
From: Jonah Petri @ 2021-08-26 19:34 UTC (permalink / raw)
  To: buildroot
  Cc: Thomas Petazzoni, Giulio Benetti, Jonah Petri, Romain Naour,
	Thomas De Schampheleire

Some 3rd party vendor toolchains have multiple files which match
these glob patterns.  In this case, the shell script failed.
Switching to use find and xargs solves the issue.

Signed-off-by: Jonah Petri <jonah@petri.us>
---
Changes:
  v2: add SOB
  v3: fix usage of `find`
    I moved away from -wholename, which seemed needlessly complex, and
instead I'm using just the base directory and -name.  Tested with
previously-failing ARM aarch64 external toolchain build.

 toolchain/helpers.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index dfb2581ed5..cb9ff6479b 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -135,10 +135,8 @@ copy_toolchain_sysroot = \
 			$(call simplify_symlink,$$i,$(STAGING_DIR)) ; \
 		done ; \
 	fi ; \
-	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 ; \
+	if [[ ! $$(find $(STAGING_DIR)/lib -name 'ld*.so.*' -print -quit) ]]; then \
+		find $${ARCH_SYSROOT_DIR}/lib -name 'ld*.so.*' -print0 | xargs -0 -I % cp % $(STAGING_DIR)/lib/; \
 	fi ; \
 	if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \
 		if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-08-30  9:12 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-26 19:34 [Buildroot] [PATCH v3 1/1] toolchain: handle toolchains with multiple ld*.so.* files Jonah Petri
2021-08-29 17:21 ` Arnout Vandecappelle
2021-08-30  0:25   ` Jonah Petri
2021-08-30  8:45     ` Yann E. MORIN
2021-08-30  9:12       ` Arnout Vandecappelle

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox