aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-04 10:47:06 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-04 10:47:06 +0000
commitf9d7df33a1e34e3b468ce3bf468615adcfe8c382 (patch)
treedea7be1deb94d8c8d246e38b98af930fff7cdd86
parentea9301bd2bf814438e31c6d5d9e78354b75752c1 (diff)
downloadruby-f9d7df33a1e34e3b468ce3bf468615adcfe8c382.tar.gz
* common.mk (run, parse): Use BTESTRUBY instead of MINIRUBY to handle
cross-compiling cases, e.g. NativeClient. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c2a4707bc6..b4ebd8d6e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 4 19:45:50 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
+
+ * common.mk (run, parse): Use BTESTRUBY instead of MINIRUBY to handle
+ cross-compiling cases, e.g. NativeClient.
+
Fri Jan 4 17:58:16 2013 Yuki Yugui Sonoda <yugui@yugui.jp>
* common.mk (yes-btest): btest depends on also $(arch)-fake.rb and
diff --git a/common.mk b/common.mk
index f0ac2c455f..00fdbb41df 100644
--- a/common.mk
+++ b/common.mk
@@ -935,14 +935,14 @@ $(srcdir)/ext/dl/callback/callback.c: $(srcdir)/ext/dl/callback/mkcallback.rb $(
##
-run: miniruby$(EXEEXT) PHONY
- $(MINIRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
+run: fake miniruby$(EXEEXT) PHONY
+ $(BTESTRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
runruby: $(PROGRAM) PHONY
$(RUNRUBY) $(TESTRUN_SCRIPT)
-parse: miniruby$(EXEEXT) PHONY
- $(MINIRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
+parse: fake miniruby$(EXEEXT) PHONY
+ $(BTESTRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
COMPARE_RUBY = $(BASERUBY)
ITEM =