diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2018-05-31 11:06:13 +0200 |
---|---|---|
committer | Uwe Kleine-König <uwe@kleine-koenig.org> | 2018-06-03 21:58:20 +0200 |
commit | 50941aa7a78ee2eb6917fedab234f2d2fe03dbf1 (patch) | |
tree | d3bbf7da79e75bb0b13731ea91a532f72d3f2435 /rules/post/cleanup.make | |
parent | 7bb4d1634d35d690aa88b7127cb07289a01c8d31 (diff) | |
download | OSELAS.Toolchain-50941aa7a78ee2eb6917fedab234f2d2fe03dbf1.tar.gz OSELAS.Toolchain-50941aa7a78ee2eb6917fedab234f2d2fe03dbf1.tar.xz |
use find -delete instead of find | xargs rmukl/wip
Also add -r to all instances of xargs to prevent execution when no matches are found.
Diffstat (limited to 'rules/post/cleanup.make')
-rw-r--r-- | rules/post/cleanup.make | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/rules/post/cleanup.make b/rules/post/cleanup.make index c06b920..9bce9a7 100644 --- a/rules/post/cleanup.make +++ b/rules/post/cleanup.make @@ -7,40 +7,39 @@ TOOLCHAIN_CLEANUP_HOST_DIRS := \ $(STATEDIR)/world.cleanup: $(STATEDIR)/world.targetinstall @$(call targetinfo) - @find "$(PTXCONF_SYSROOT_CROSS)/"* -depth -type d -print0 | \ - xargs -r -0 -- rmdir -v --ignore-fail-on-non-empty -- + @find "$(PTXCONF_SYSROOT_CROSS)/"* -depth -type d -empty -delete -printf 'removing %p' + # # remove all static host libraries find $(TOOLCHAIN_CLEANUP_HOST_DIRS) \ -wholename "$(PTXCONF_SYSROOT_CROSS)/lib/gcc" -prune -o \ - -type f -name "*.a" -print0 | xargs -0 -r rm + -type f -name "*.a" -delete # # strip all host binaries find $(TOOLCHAIN_CLEANUP_HOST_DIRS) \ -wholename "$(PTXCONF_SYSROOT_CROSS)/lib/gcc" -prune -o \ -type f \( -executable -o -name "*.so*" \) -print0 \ - | xargs -0 -n1 --verbose strip --preserve-dates || true + | xargs -r -0 -n1 --verbose strip --preserve-dates || true # # make sure there are no bogus rpaths find "$(PTXCONF_SYSROOT_CROSS)/$(call remove_quotes,$(PTXCONF_GNU_TARGET))" \ -type f \( -executable -o -name "*.so*" \) -print0 \ - | xargs -0 chrpath -k -d 2>/dev/null || true + | xargs -r -0 chrpath -k -d 2>/dev/null || true ifdef PTXCONF_TOOLCHAIN_CONFIG_SYSROOT # # size compromise: compressed debug sections in static libraries are too large find "$(PTXCONF_SYSROOT_CROSS)/sysroot-$(call remove_quotes,$(PTXCONF_GNU_TARGET))/usr/lib" \ -type f -name "*.a" -print0 \ - | xargs -0 -n1 $(PTXCONF_SYSROOT_CROSS)/bin/$(PTXCONF_GNU_TARGET)-objcopy \ + | xargs -r -0 -n1 $(PTXCONF_SYSROOT_CROSS)/bin/$(PTXCONF_GNU_TARGET)-objcopy \ --preserve-dates --strip-debug --keep-file-symbols || true endif # # compress debug sections and remove any absolute paths find "$(PTXCONF_SYSROOT_CROSS)" "$(PTXCONF_SYSROOT_CROSS)/lib/gcc" \ $(patsubst %,-wholename % -prune -o,$(TOOLCHAIN_CLEANUP_HOST_DIRS)) \ -type f \( -executable -o -name "*.so*" -o -name "*.a" -o -name "*.o" \) -print0 \ - | xargs -0 -n1 $(PTXCONF_SYSROOT_CROSS)/bin/$(PTXCONF_GNU_TARGET)-objcopy \ + | xargs -r -0 -n1 $(PTXCONF_SYSROOT_CROSS)/bin/$(PTXCONF_GNU_TARGET)-objcopy \ --wildcard \ --strip-symbol=$(GLIBC_BUILDDIR)/*.o \ --strip-symbol=$(GLIBC_BUILDDIR)/*.os \ --strip-symbol=$(PTXCONF_SYSROOT_TARGET)/usr/lib/*.o \ --preserve-dates --compress-debug-sections 2>/dev/null || true - find "$(PTXCONF_SYSROOT_TARGET)" \ - -name "*.cmd" -print0 | xargs -0 -r rm + find "$(PTXCONF_SYSROOT_TARGET)" -name "*.cmd" -delete @$(call touch) |