diff options
| -rw-r--r-- | package/glibc/glibc.mk | 4 | ||||
| -rw-r--r-- | toolchain/helpers.mk | 6 | ||||
| -rw-r--r-- | toolchain/toolchain-external/pkg-toolchain-external.mk | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 58cb3d46c5..ccaa4c2a98 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -110,8 +110,8 @@ GLIBC_LIBS_LIB += libthread_db.so.* endif define GLIBC_INSTALL_TARGET_CMDS - for libs in $(GLIBC_LIBS_LIB); do \ - $(call copy_toolchain_lib_root,$$libs) ; \ + for libpattern in $(GLIBC_LIBS_LIB); do \ + $(call copy_toolchain_lib_root,$$libpattern) ; \ done endef diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 0ec9da42f2..e83bf272e7 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -6,12 +6,12 @@ # toolchain logic, and the glibc package, so care must be taken when # changing this function. # -# $1: library name +# $1: library name pattern (can include glob wildcards) # copy_toolchain_lib_root = \ - LIB="$(strip $1)"; \ + LIBPATTERN="$(strip $1)"; \ \ - LIBPATHS=`find $(STAGING_DIR)/ -name "$${LIB}" 2>/dev/null` ; \ + LIBPATHS=`find $(STAGING_DIR)/ -name "$${LIBPATTERN}" 2>/dev/null` ; \ for LIBPATH in $${LIBPATHS} ; do \ DESTDIR=`echo $${LIBPATH} | sed "s,^$(STAGING_DIR)/,," | xargs dirname` ; \ mkdir -p $(TARGET_DIR)/$${DESTDIR}; \ diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index a4d010a93c..9670350dc0 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -387,8 +387,8 @@ endef ifeq ($(BR2_STATIC_LIBS),) define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS $(Q)$(call MESSAGE,"Copying external toolchain libraries to target...") - $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ - $(call copy_toolchain_lib_root,$$libs); \ + $(Q)for libpattern in $(TOOLCHAIN_EXTERNAL_LIBS); do \ + $(call copy_toolchain_lib_root,$$libpattern); \ done endef endif |
