Author: jow Date: 2014-06-27 12:40:21 +0200 (Fri, 27 Jun 2014) New Revision: 41357
Modified: trunk/package/libs/toolchain/Makefile Log: 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 <[email protected]> Modified: trunk/package/libs/toolchain/Makefile =================================================================== --- trunk/package/libs/toolchain/Makefile 2014-06-27 10:32:09 UTC (rev 41356) +++ trunk/package/libs/toolchain/Makefile 2014-06-27 10:40:21 UTC (rev 41357) @@ -289,9 +289,9 @@ 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.*) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
