From 6e4b187bfe582614a491008a68292e8e67a6cfb0 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 7 Jan 2013 06:23:15 +0000
Subject: * Makefile.in, common.mk (fake, yes-fake, no-make): these dependecies
   are not platform dependent.

* win32/Makefile.sub ($(arch)-fake.rb): workaround.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          |  7 +++++++
 Makefile.in        |  3 ---
 common.mk          |  4 ++++
 win32/Makefile.sub | 14 +++++++-------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6aa608ce1c..8529690231 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jan  7 15:21:48 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):
diff --git a/Makefile.in b/Makefile.in
index f5ffea88bc..e68976257b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -223,9 +223,6 @@ $(LIBRUBY_SO):
 		@-$(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 $@
diff --git a/common.mk b/common.mk
index 8d4316e3ef..2e90d074bd 100644
--- a/common.mk
+++ b/common.mk
@@ -474,6 +474,10 @@ check: main test test-all
 	$(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
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 33756830c1..3f62197cfb 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -13,7 +13,7 @@ MFLAGS=-l
 !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)
 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 -I"$(EXTOUT)/$(arch)" -I.
 !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
 
 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)/revision.h $(srcdir)/win32/resource.rb
 			-so_name=$(RUBY_SO_NAME) \
 			. $(icondirs) $(win_srcdir)
 
-fake.rb: $(MKFILES)
+$(arch)-fake.rb: $(MKFILES)
 	@echo Creating <<$@
 class Object
   CROSS_COMPILING = RUBY_PLATFORM
-- 
cgit v1.2.3