From ab15584a3a80e0239a25b0e4cc3ed1221ba1af5c Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 1 Feb 2017 04:54:04 +0000 Subject: common.mk: remove explicit MFLAGS It is unnecessary to pass MFLAGS to sub-makes, because it is evaluated implicitly if set by make. GNU make 4.2 sets both of -jN and --jobserver-auth (or --jobserver-fds in older versions) options which conflict. And it is useless for command line macros since Microsoft NMAKE does not set them. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- Makefile.in | 2 +- common.mk | 28 ++++++++++++++-------------- template/exts.mk.tmpl | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile.in b/Makefile.in index d5a3c3d459..012ed954d2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -423,7 +423,7 @@ clean-ext distclean-ext realclean-ext:: cd ..; \ for dir do \ echo $(@:-ext=)ing "$$dir"; \ - (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \ + (cd "ext/$$dir" && exec $(MAKE) $(@:-ext=)) && \ case "$@" in \ *distclean-ext*|*realclean-ext*) \ $(RMDIRS) "ext/$$dir" 2> /dev/null || true;; \ diff --git a/common.mk b/common.mk index 51385c893f..eee5886dd5 100644 --- a/common.mk +++ b/common.mk @@ -66,7 +66,7 @@ EXTSOLIBS = MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT) ENC_MK = enc.mk MAKE_ENC = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \ - RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) + RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" COMMONOBJS = array.$(OBJEXT) \ bignum.$(OBJEXT) \ @@ -227,7 +227,7 @@ ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RBCONFIG) $(LIBRUBY) configure-ext: $(EXTS_MK) build-ext: $(EXTS_MK) - $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \ + $(Q)$(MAKE) -f $(EXTS_MK) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \ EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC) ext/extinit.c: $(srcdir)/template/extinit.c.tmpl @@ -244,7 +244,7 @@ objs: $(ALLOBJS) GORUBY = go$(RUBY_INSTALL_NAME) golf: $(LIBRUBY) $(GOLFOBJS) PHONY - $(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program + $(Q) $(MAKE) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program capi: $(CAPIOUT)/.timestamp PHONY $(CAPIOUT)/.timestamp: Doxyfile $(PREP) @@ -922,18 +922,18 @@ $(srcdir)/ext/ripper/ripper.c: $(srcdir)/parse.y id.h $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ sed /AUTOGENERATED/q depend | \ - $(exec) $(MAKE) -f - $(MFLAGS) \ + $(exec) $(MAKE) -f - \ Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$(PWD)" \ RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(ECHO) generating $@ - $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \ + $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)" $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list $(ECHO) generating $@ - $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \ + $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. BASERUBY="$(BASERUBY)" $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ @@ -941,7 +941,7 @@ $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ sed '/AUTOGENERATED/q' depend | \ - $(exec) $(MAKE) -f - $(MFLAGS) \ + $(exec) $(MAKE) -f - \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F) $(srcdir)/ext/rbconfig/sizeof/limits.c: $(srcdir)/ext/rbconfig/sizeof/depend \ @@ -949,13 +949,13 @@ $(srcdir)/ext/rbconfig/sizeof/limits.c: $(srcdir)/ext/rbconfig/sizeof/depend \ $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ sed '/AUTOGENERATED/q' depend | \ - $(exec) $(MAKE) -f - $(MFLAGS) \ + $(exec) $(MAKE) -f - \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F) $(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend $(Q) $(CHDIR) $(@D) && \ sed '/AUTOGENERATED/q' depend | \ - $(exec) $(MAKE) -f - $(MFLAGS) \ + $(exec) $(MAKE) -f - \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)" ## @@ -1029,10 +1029,10 @@ dist: up:: update-remote up:: - -$(Q)$(MAKE) $(MFLAGS) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)" + -$(Q)$(MAKE) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)" up:: - -$(Q)$(MAKE) $(MFLAGS) Q=$(Q) after-update + -$(Q)$(MAKE) Q=$(Q) after-update after-update:: extract-extlibs @@ -1115,7 +1115,7 @@ $(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): $(UNI $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ $(srcdir)/template/unicode_norm_gen.tmpl - $(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode + $(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \ -c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \ -I $(srcdir) \ @@ -1125,7 +1125,7 @@ $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ # UPDATE_NAME2CTYPE= : toplevel # UPDATE_NAME2CTYPE=yes : sub-make to update name2ctype.h $(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=.ignore.)name2ctype.h: - $(Q) $(MAKE) $(MFLAGS) Q=$(Q) UPDATE_NAME2CTYPE=yes UNICODE_VERSION=$(UNICODE_VERSION) $@ + $(Q) $(MAKE) Q=$(Q) UPDATE_NAME2CTYPE=yes UNICODE_VERSION=$(UNICODE_VERSION) $@ $(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=name2ctype.h): \ $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \ @@ -1144,7 +1144,7 @@ $(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=casefold.h): \ $(UNICODE_SRC_DATA_DIR)/CaseFolding.txt $(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb - $(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode + $(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode $(MAKEDIRS) $(@D) $(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \ --output-file=$@ \ diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl index 6215e5da0e..bf110c5c94 100644 --- a/template/exts.mk.tmpl +++ b/template/exts.mk.tmpl @@ -111,17 +111,17 @@ distclean: % rubies.each do |ruby| <%= ruby %>: - $(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS) $@ + $(Q)$(MAKE) $(SUBMAKEOPTS) $@ % end libencs: $(Q)$(MAKE) -f enc.mk V=$(V) $@ ext/extinit.<%=objext%>: - $(Q)$(MAKE) $(MFLAGS) V=$(V) EXTINITS="$(EXTINITS)" $@ + $(Q)$(MAKE) V=$(V) EXTINITS="$(EXTINITS)" $@ % targets.product(macros["extensions"].map {|e|e.chomp("/.")}) do |t, e| <%=e%>/<%=t%>: - $(Q)<%= submake %> $(MFLAGS) V=$(V) $(@F) + $(Q)<%= submake %> V=$(V) $(@F) % end extso: -- cgit v1.2.3