diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-12 14:31:59 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-12 14:31:59 +0000 |
| commit | 68eb3d86a1ee9b7ca6b26bb30f930ab74b1b4ce1 (patch) | |
| tree | b637726e00fb9bfb793731470e52fe96c9fa179f /common.mk | |
| parent | 52301063d4e81d292cb180b7fe99db8e38304c61 (diff) | |
merge revision(s) 42862(partially),42910,43093: [Backport #8878] [Backport #9085]
* common.mk: use RUNRUBY instead of MINIRUBY because MINIRUBY can't
require extension libraries. The patch is from nobu
(Nobuyoshi Nakada).
* configure.in (RUNRUBY): append -- only after runruby.rb, not
cross-compiling baseruby, so that $(RUN_OPT) can be command line
options. [ruby-dev:47703] [Bug #8893]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -120,7 +120,7 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --make-flags="$(MAKEFLAGS)" EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \ --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" -- -INSTRUBY = $(SUDO) $(MINIRUBY) $(srcdir)/tool/rbinstall.rb +INSTRUBY = $(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb INSTRUBY_ARGS = $(SCRIPT_ARGS) \ --data-mode=$(INSTALL_DATA_MODE) \ --prog-mode=$(INSTALL_PROG_MODE) \ @@ -432,7 +432,7 @@ post-no-install-doc:: CLEAR_INSTALLED_LIST = clear-installed-list -install-prereq: $(CLEAR_INSTALLED_LIST) PHONY +install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake PHONY clear-installed-list: PHONY @> $(INSTALLED_LIST) set MAKE="$(MAKE)" |