summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-24 02:56:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-24 02:56:33 +0000
commit67d3013c5a40362a1fdf4b33489ce3247d11e835 (patch)
tree92c29128ec3ddba40799d790758dc8beedaf80d5 /common.mk
parent836a01c51069ab741e304dadcb0f233f763a59bd (diff)
* common.mk: should not pass MAKEFLAGS to recursive make.
+ normal make: MFLAGS are set and command line options and macros are all passed silently. + GNU make: ditto, and all options and macros in MAKEFLAGS are in effect. + nmake: MFLAGS is not set and MAKEFLAGS has only options without hyphen, no macros exist in any variables. + Borland make: ditto, and command line macros cannot override macros in makefile, so passing them is vain. * {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 91c22422ba..14d8743fab 100644
--- a/common.mk
+++ b/common.mk
@@ -342,7 +342,7 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
encs: enc.mk
$(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc"
- $(MAKE) -f enc.mk $(MFLAGS) $(MAKEFLAGS)
+ $(MAKE) -f enc.mk $(MFLAGS)
enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
$(srcdir)/lib/mkmf.rb $(RBCONFIG)
@@ -666,7 +666,7 @@ revision.h:
exit > $@
$(srcdir)/ext/ripper/ripper.c:
- cd $(srcdir)/ext/ripper && exec $(MAKE) -f depend $(MFLAGS) $(MAKEFLAGS) top_srcdir=../.. srcdir=.
+ cd $(srcdir)/ext/ripper && exec $(MAKE) -f depend $(MFLAGS) top_srcdir=../.. srcdir=.
##