Message ID | 1454535929-25379-2-git-send-email-patrickdepinguin@gmail.com |
---|---|
State | Accepted |
Headers | show |
Dear Thomas De Schampheleire, On Wed, 3 Feb 2016 22:45:28 +0100, Thomas De Schampheleire wrote: > From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> > > LIBSPATH is populated based on a find with a pattern that can look like: > libfoo*.so > and thus the output of the find will contain all file paths that match this > pattern. > > Unfortunately, the name LIBSPATH suggests that only one entry is returned, > rather than possibly multiple. > > As this code is quite complex, use the more accurate name LIBPATHS iso > LIBSPATH. > > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> > --- > toolchain/helpers.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Applied, thanks. Thomas
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 02cc0bb..ee878e8 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -55,13 +55,13 @@ copy_toolchain_lib_root = \ $${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR} \ $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \ $${SUPPORT_LIB_DIR} ; do \ - LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}" 2>/dev/null` ; \ - if test -n "$${LIBSPATH}" ; then \ + LIBPATHS=`find $${dir} -maxdepth 1 -name "$${LIB}" 2>/dev/null` ; \ + if test -n "$${LIBPATHS}" ; then \ break ; \ fi \ done ; \ mkdir -p $(TARGET_DIR)/$${DESTDIR}; \ - for LIBPATH in $${LIBSPATH} ; do \ + for LIBPATH in $${LIBPATHS} ; do \ while true ; do \ LIBNAME=`basename $${LIBPATH}`; \ LIBDIR=`dirname $${LIBPATH}` ; \