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 /common.mk | |
| 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 'common.mk')
| -rw-r--r-- | common.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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) \ |