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 | b655714f18973c50b34aac11edee8abb9c8fdf2b (patch) | |
| tree | 11d87a61b6b0484f07fc219e84dc6c166f31cc2c | |
| parent | abecf8c664091878ae9ba8dd87ca2b1283f7e827 (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/branches/ruby_1_8@14570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 | ||||
| -rw-r--r-- | wince/Makefile.sub | 2 |
5 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Mon Dec 24 11:56:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * {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. + Sat Dec 22 14:49:46 2007 Tadayoshi Funaba <tadf@dotrb.org> * lib/date.rb: don't freeze nil even if 1.8 will not be aware of diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 93452bea01..cbdff389a2 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -346,7 +346,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,@CP@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t s,@ALLOCA@,$(ALLOCA),;t t @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-12-19" +#define RUBY_RELEASE_DATE "2007-12-24" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20071219 +#define RUBY_RELEASE_CODE 20071224 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 24 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 955f634862..30eb6908f3 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -366,7 +366,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,@CP@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t s,@ALLOCA@,$(ALLOCA),;t t diff --git a/wince/Makefile.sub b/wince/Makefile.sub index dbcad66c1c..ca1c4421bb 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -353,7 +353,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,@CP@,copy > nul,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj isinf.obj isnan.obj,;t t s,@ALLOCA@,$(ALLOCA),;t t |