toolchain/binutils: let make expand wildcards instead of the shell

Based on f97ce837 in Bernhard's tree.

diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index d1543058b8802dce445a741dd611cfaa54669b53..32b3a2cb74f4c00a3240bc97dddb0016329715a4 100644 (file)
--- a/toolchain/binutils/binutils.mk
+++ b/toolchain/binutils/binutils.mk
@@ -132,17 +132,16 @@ binutils: uclibc-configured $(BINUTILS_HOST_PREREQ) $(STAGING_DIR)/usr/bin/$(REA
 binutils-source: $(DL_DIR)/$(BINUTILS_SOURCE)
 
 binutils-clean:
-       rm -rf $(STAGING_DIR)/usr/bin/*{ar,as,ld,nm,objdump,ranlib,strip} \
-               $(STAGING_DIR)/usr/lib/{libiberty*,ldscripts}
        -$(MAKE) -C $(BINUTILS_DIR1) DESTDIR=$(STAGING_DIR) \
                tooldir=/usr build_tooldir=/usr uninstall
        -$(MAKE) -C $(BINUTILS_DIR1) clean
+       rm -rf $(wildcard $(patsubst %,$(STAGING_DIR)/usr/bin/*%,ar as ld nm objdump ranlib strip c++filt)) \
+               $(wildcard $(patsubst %,$(STAGING_DIR)/usr/lib/%*,libiberty ldscripts))
 
 binutils-dirclean:
        rm -rf $(BINUTILS_DIR1)
 
 
-
 #############################################################
 #
 # build binutils for use on the target system
@@ -183,12 +182,9 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump
 binutils_target: $(BINUTILS_TARGET_PREREQ) $(TARGET_DIR)/usr/bin/ld
 
 binutils_target-clean:
-       (cd $(TARGET_DIR)/usr/bin; \
-               rm -f addr2line ar as gprof ld nm objcopy \
-                     objdump ranlib readelf size strings strip; \
-       )
-       rm -f $(TARGET_DIR)/bin/$(REAL_GNU_TARGET_NAME)*
        -$(MAKE) -C $(BINUTILS_DIR2) clean
+       rm -f $(TARGET_DIR)/bin/$(REAL_GNU_TARGET_NAME)* \
+               $(addprefix $(TARGET_DIR)/usr/bin/, addr2line ar as gprof ld nm objcopy objdump ranlib readelf size strings strip c++filt)
 
 binutils_target-dirclean:
        rm -rf $(BINUTILS_DIR2)