diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:15:28 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-17 06:15:28 +0000 |
| commit | a645353b6847d97468b062ea6e7505c35941a7db (patch) | |
| tree | 85994bf8ee7ef49fdb0c74a70c660689e6c64db1 | |
| parent | 12f48e519467ef02fa108418f134042f2543d133 (diff) | |
merges r20745 from trunk into ruby_1_9_1.
* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
[ruby-core:20131]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | common.mk | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +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] + Mon Dec 15 14:39:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_eval.c (vm_call0): NODE_ZSUPER supported. [ruby-core:20480] @@ -100,7 +100,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) \ |