summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-15 06:02:27 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-15 06:02:27 +0000
commit465bad4147f014a406083831552b95317c019841 (patch)
tree60efbb9d8bc084fcd6427f5f13d75f45d6359eb5
parentf6147010c7bdcfae90de759003f7ffd338348bef (diff)
* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
[ruby-core:20131] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fdac357..e5dbbea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 15 15:02:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
+ [ruby-core:20131]
+
Mon Dec 15 14:39:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (vm_call0): NODE_ZSUPER supported. [ruby-core:20480]
diff --git a/common.mk b/common.mk
index 315672e..56f21e3 100644
--- a/common.mk
+++ b/common.mk
@@ -100,7 +100,8 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
--extout="$(EXTOUT)" \
--mflags="$(MFLAGS)" \
--make-flags="$(MAKEFLAGS)"
-EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) --
+EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
+ --make-flags="MINIRUBY=\"$(MINIRUBY)\"" --
INSTRUBY_ARGS = $(SCRIPT_ARGS) \
--data-mode=$(INSTALL_DATA_MODE) \
--prog-mode=$(INSTALL_PROG_MODE) \