usa	2013-01-07 15:23:15 +0900 (Mon, 07 Jan 2013)

  New Revision: 38720

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38720

  Log:
    * Makefile.in, common.mk (fake, yes-fake, no-make): these dependecies
      are not platform dependent.
    
    * win32/Makefile.sub ($(arch)-fake.rb): workaround.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38719)
+++ ChangeLog	(revision 38720)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Jan  7 15:21:48 2013  NAKAMURA Usaku  <usa@r...>
+
+	* Makefile.in, common.mk (fake, yes-fake, no-make): these dependecies
+	  are not platform dependent.
+
+	* win32/Makefile.sub ($(arch)-fake.rb): workaround.
+
 Mon Jan  7 12:09:24 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):
Index: common.mk
===================================================================
--- common.mk	(revision 38719)
+++ common.mk	(revision 38720)
@@ -474,6 +474,10 @@ check: main test test-all https://github.com/ruby/ruby/blob/trunk/common.mk#L474
 	$(ECHO) check succeeded
 check-ruby: test test-ruby
 
+fake: $(CROSS_COMPILING)-fake
+yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY
+no-fake: PHONY
+
 btest: $(TEST_RUNNABLE)-btest
 no-btest: PHONY
 yes-btest: fake miniruby$(EXEEXT) PHONY
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 38719)
+++ win32/Makefile.sub	(revision 38720)
@@ -13,7 +13,7 @@ MFLAGS=-l https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L13
 !endif
 
 !ifndef CROSS_COMPILING
-CROSS_COMPILING = 0
+CROSS_COMPILING = no
 !endif
 !ifndef LARGEFILE_SUPPORT
 LARGEFILE_SUPPORT = 1
@@ -269,8 +269,8 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L269
 WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
 !endif
 RUBYDEF = $(RUBY_SO_NAME).def
-!if $(CROSS_COMPILING)
-MINIRUBY = $(RUBY) -I$(MAKEDIR) -rfake
+!if "$(CROSS_COMPILING)" == "yes"
+MINIRUBY = $(RUBY) -I$(MAKEDIR) -r$(arch)-fake
 RUNRUBY = $(MINIRUBY)
 !else
 MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I.
@@ -278,7 +278,7 @@ RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib - https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L278
 !endif
 MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
 RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS)
-!if $(CROSS_COMPILING)
+!if "$(CROSS_COMPILING)" == "yes"
 XRUBY = $(MINIRUBY)
 !else
 XRUBY = $(RUNRUBY)
@@ -317,8 +317,8 @@ LIBRUBY_RELATIVE = yes https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L317
 
 THREAD_MODEL  = win32
 
-!if $(CROSS_COMPILING)
-PREP          = fake.rb
+!if "$(CROSS_COMPILING)" == "yes"
+PREP          = $(arch)-fake.rb
 !else
 PREP          = miniruby$(EXEEXT)
 !endif
@@ -984,7 +984,7 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revisi https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L984
 			-so_name=$(RUBY_SO_NAME) \
 			. $(icondirs) $(win_srcdir)
 
-fake.rb: $(MKFILES)
+$(arch)-fake.rb: $(MKFILES)
 	@echo Creating <<$@
 class Object
   CROSS_COMPILING = RUBY_PLATFORM
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 38719)
+++ Makefile.in	(revision 38720)
@@ -223,9 +223,6 @@ $(LIBRUBY_SO): https://github.com/ruby/ruby/blob/trunk/Makefile.in#L223
 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
-fake: $(CROSS_COMPILING)-fake
-yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY
-no-fake: PHONY
 $(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in
 		@./config.status --file=$@:$(srcdir)/template/fake.rb.in
 		@chmod +x $@

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/