diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 02:56:33 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 02:56:33 +0000 |
commit | 67d3013c5a40362a1fdf4b33489ce3247d11e835 (patch) | |
tree | 92c29128ec3ddba40799d790758dc8beedaf80d5 /win32 | |
parent | 836a01c51069ab741e304dadcb0f233f763a59bd (diff) | |
download | bundler-67d3013c5a40362a1fdf4b33489ce3247d11e835.tar.gz |
* 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 'win32')
-rw-r--r-- | win32/Makefile.sub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ffe25d5e2b..bf8ddf8d57 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -429,7 +429,7 @@ s,@RANLIB@,,;t t s,@AR@,$(AR),;t t s,@ARFLAGS@,$(ARFLAGS),;t t s,@LN_S@,$(LN_S),;t t -s,@SET_MAKE@,$(SET_MAKE),;t t +s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t s,@RM@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat,;t t s,@CP@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcpy.obj strlcat.obj win32.obj,;t t |