From 225435514ca588287ad4d06408deea9fabda4013 Mon Sep 17 00:00:00 2001 From: sorah Date: Wed, 29 Mar 2017 09:24:10 +0000 Subject: [PATCH] Fix `make clean` errors Patch by Kohei Suzuki . * common.mk(clean-rubyspec): Supress error messages when rubyspec files don't exist. [GH-1563] [Bug #13384] * Makefile.in: Fix error when files don't exist. [GH-1563] [Bug #13384] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58207 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 2 +- common.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index a2a17039c6..07f93ca150 100644 --- a/Makefile.in +++ b/Makefile.in @@ -421,7 +421,7 @@ ext/distclean.sub gems/distclean.sub:: ext/distclean.mk ext/realclean.sub gems/realclean.sub:: ext/realclean.mk ext/clean.mk ext/distclean.mk ext/realclean.mk:: - $(Q) [ -f $(EXTS_MK) ] && exec $(MAKE) -f $(EXTS_MK) $(@F:.mk=) + -$(Q) if [ -f $(EXTS_MK) ]; then exec $(MAKE) -f $(EXTS_MK) $(@F:.mk=); fi ext/clean:: ext/clean.sub ext/distclean:: ext/distclean.sub diff --git a/common.mk b/common.mk index bf03a821c5..608e4a2d0d 100644 --- a/common.mk +++ b/common.mk @@ -621,7 +621,7 @@ clean-platform: RUBYSPEC_CAPIEXT = spec/rubyspec/optional/capi/ext clean-rubyspec: PHONY -$(Q) $(RM) $(RUBYSPEC_CAPIEXT)/*.$(OBJEXT) $(RUBYSPEC_CAPIEXT)/*.$(DLEXT) - -$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) + -$(Q) $(RMDIRS) $(RUBYSPEC_CAPIEXT) 2> $(NULL) || exit 0 check: main test test-testframework test-almost $(ECHO) check succeeded