summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-13 10:40:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-13 10:40:11 +0000
commitf57adf7b5b91bc54375e334aba777c45c5da0998 (patch)
treefd3439b28bd3999a30ab63e9c73603221331423f
parentcb476b40e311a9da9fb370bb181187ce3dad9449 (diff)
* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
[ruby-core:20131] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog20
-rw-r--r--common.mk3
2 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e2c4fa3ccb..eb4ee1aa1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Fri Mar 13 19:40:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
+ [ruby-core:20131]
+
+Mon Dec 15 20:16:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * common.mk (EXTMK_ARGS): shouldn't use ``\"'' because cmd.exe eat
+ ''\'' in such quotes.
+
+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]
+
+Tue Feb 3 07:01:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * mkconfig.rb (patchlevel): config.status may not contain
+ PATCHLEVEL even if other version numbers exist.
+
Thu Mar 12 15:26:02 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/openssl/test_ssl.rb (OpenSSL#test_client_session):
diff --git a/common.mk b/common.mk
index d153074e91..1928fdba48 100644
--- a/common.mk
+++ b/common.mk
@@ -64,7 +64,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) \