diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-06-27 10:40:21 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-06-27 10:40:21 +0000 |
| commit | 4255b2fde576ee47ac75a71d6fc3f1fed04fb596 (patch) | |
| tree | a8e01b6ae448bfaf8bbd322f181b35c42bcad6c2 | |
| parent | c026f34ce61baf3b94286e4ed5a957295de7f607 (diff) | |
| download | upstream-4255b2fde576ee47ac75a71d6fc3f1fed04fb596.tar.gz upstream-4255b2fde576ee47ac75a71d6fc3f1fed04fb596.tar.bz2 upstream-4255b2fde576ee47ac75a71d6fc3f1fed04fb596.zip | |
toolchain: only take last found libgcc* file
The current $(wildcard ...) match might return multiple files which will break subsequent cp commands
with an error like:
cp: target `/home/user/openwrt/staging_dir/target-mips_34kc_uClibc-0.9.33.2/root-ar71xx/tmp-libc/lib/libgcc_s_pic.a' is not a directory
Prevent this issue by only taking the last path returned by globbing.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 41357
| -rw-r--r-- | package/libs/toolchain/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile index 117447f581..e4a78ed5f2 100644 --- a/package/libs/toolchain/Makefile +++ b/package/libs/toolchain/Makefile @@ -289,9 +289,9 @@ define Build/Prepare mkdir -p $(PKG_BUILD_DIR) endef -LIBGCC_A=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a) -LIBGCC_MAP=$(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map) -LIBGCC_SO=$(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*) +LIBGCC_A=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc_pic.a)) +LIBGCC_MAP=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/gcc/*/*/libgcc.map)) +LIBGCC_SO=$(lastword $(wildcard $(TOOLCHAIN_DIR)/lib/libgcc_s.so.*)) ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) ifneq ($(if $(CONFIG_USE_UCLIBC),$(CONFIG_GCC_VERSION_LINARO)),) BUILD_LIBGCC:=$(if $(CONFIG_avr32)$(CONFIG_m68k)$(CONFIG_powerpc),,$(PKG_BUILD_DIR)/libgcc_s.so.*) |