summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-12-05 15:27:38 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-12-05 15:27:38 +0000
commit7249f4898e3f8d323183774a3a29fd20ba5b4dc5 (patch)
tree770d621e6eba7bf18823bc864b8c98e1b115e8b7
parent7240678463356639c5a183420774af0307941fc3 (diff)
toolchain/binutils: let make expand wildcards instead of the shell
Based on f97ce837 in Bernhard's tree.
-rw-r--r--toolchain/binutils/binutils.mk12
1 files changed, 4 insertions, 8 deletions
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index d1543058b..32b3a2cb7 100644
--- 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)