summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-27 19:00:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-27 19:00:35 +0000
commitcc55fb42a453f48098466c0ecb6eb0851204e254 (patch)
tree220c09cebb8f22c2440a371efc992a993dbdcc6b
parent8f3eeafdbf05551ed58e73353eb8922d6d8c54ab (diff)
* ext/extmk.rb: MINIRUBY is given via make-flag.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/extmk.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bc80025662..9926a8ab56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 28 04:00:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: MINIRUBY is given via make-flag.
+
Wed Mar 25 00:20:38 2009 Akinori MUSHA <knu@iDaemons.org>
* lib/cgi.rb: $KCODE always holds its value in upper case.
diff --git a/ext/extmk.rb b/ext/extmk.rb
index ca2fce937a..af28580174 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -349,7 +349,7 @@ end
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