kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* common.mk: should not pass MAKEFLAGS to recursive make.

Browse source 
+ 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
This commit is contained in:
nobu 2007-12-24 02:56:33 +00:00
parent 836a01c510
commit 67d3013c5a
5 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ChangeLog
View file

@ -1,3 +1,18 @@
Mon Dec 24 11:56:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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.
Mon Dec 24 11:32:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_comparable): fixed to keep transitivity.
@ -6,19 +21,19 @@ Mon Dec 24 11:32:44 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
Mon Dec 24 11:20:31 2007 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/ri/ri_options.rb: Fix display of GEMDIRS, make command
examples match ri's name.
examples match ri's name.
* lib/rdoc/ri/ri_paths.rb: Only allow latest ri dirs in ri output.
Mon Dec 24 10:49:04 2007 Eric Hodel <drbrain@segment7.net>
* lib/uri/mailto.rb, lib/uri/common.rb: Fix Regexp warnings. Patch
#16524 from Kornelius Kalnbach, [ruby-core:14302].
#16524 from Kornelius Kalnbach, [ruby-core:14302].
Mon Dec 24 10:37:38 2007 Eric Hodel <drbrain@segment7.net>
* gem_prelude.rb: Remove methods from Gem, not QuickLoader, to fix
warnings.
warnings.
Mon Dec 24 09:45:45 2007 Martin Duerst <duerst@it.aoyama.ac.jp>

2
bcc32/Makefile.sub
View file

@ -388,7 +388,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@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
s,@CP@,copy > nul,;t t
s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj,;t t

4
common.mk
View file

@ -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=.
##

2
win32/Makefile.sub
View file

@ -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

2
wince/Makefile.sub
View file

@ -383,7 +383,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@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
s,@CP@,copy > nul,;t t
s,@LIBOBJS@, acosh.obj crypt.obj erf.obj strlcat.obj strlcpy.obj win32.obj isinf.obj isnan.obj,;t t