merge revision(s) 22931,23086:

* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile. [ruby-core:20131] * common.mk (EXTMK_ARGS): shouldn't use ``\"'' because cmd.exe eat ''\'' in such quotes. * common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile. [ruby-core:20131] * mkconfig.rb (patchlevel): config.status may not contain PATCHLEVEL even if other version numbers exist. * ext/extmk.rb: MINIRUBY is given via make-flag. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@26172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
kstephens · Dec 24, 2009 · c4f9a9e · c4f9a9e
1 parent cea49f7
commit c4f9a9e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,27 @@
+Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: MINIRUBY is given via make-flag.
+
+Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
+	  [ruby-core:20131]
+
+Thu Dec 24 17:56:32 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (EXTMK_ARGS): shouldn't use ``\"'' because cmd.exe eat
+	  ''\'' in such quotes.
+
+Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
+	  [ruby-core:20131]
+
+Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* mkconfig.rb (patchlevel): config.status may not contain
+	  PATCHLEVEL even if other version numbers exist.
+
 Thu Dec 24 17:50:35 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* ext/stringio/stringio.c (strio_init): rewind when reopened.

diff --git 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) \

diff --git a/ext/extmk.rb b/ext/extmk.rb
@@ -347,7 +347,7 @@ def $mflags.defined?(var)
 
 EXEEXT = CONFIG['EXEEXT']
 if CROSS_COMPILING
-  $ruby = CONFIG['MINIRUBY']
+  $ruby = $mflags.defined?("MINIRUBY") || CONFIG['MINIRUBY']
 elsif sep = config_string('BUILD_FILE_SEPARATOR')
   $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
 else

diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091224
-#define RUBY_PATCHLEVEL 246
+#define RUBY_PATCHLEVEL 247
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8