diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-24 09:01:58 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-24 09:01:58 +0000 |
| commit | c4f9a9e3623296dcf4ae2215909994e3862cae63 (patch) | |
| tree | f58662bbeaf2834a5a713fd6dd1e694cf3eeb534 /ext | |
| parent | cea49f7ca653df88fa0432e673179dde86b6c4ff (diff) | |
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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 2527645ad8..df2e4c069e 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -347,7 +347,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 |