diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-11 08:30:48 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-09-11 08:30:48 +0000 |
| commit | 5397a256348fd53e9ae01ab96e0890d887c21182 (patch) | |
| tree | 550e784666497615add0fb0bb3dce07a934c8c06 | |
| parent | ed6c17f75c9df0885cc3ab6eb8b2e7a04b154260 (diff) | |
| download | ruby-5397a256348fd53e9ae01ab96e0890d887c21182.tar.gz | |
configure.in: fix cross-compiling installation failure
* 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/trunk@42910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Sep 11 17:30:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Wed Sep 11 07:55:17 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * thread.c (rb_mutex_unlock): Mutex#unlock no longer raise diff --git a/Makefile.in b/Makefile.in index 3c42ebd3e6..0034381630 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,7 +96,7 @@ RUBY = $(RUBY_INSTALL_NAME) MINIRUBY = @MINIRUBY@\ $(MINIRUBYOPT) RUNRUBY_COMMAND = @RUNRUBY@ $(RUNRUBYOPT) -RUNRUBY = $(RUNRUBY_COMMAND) -- $(RUN_OPTS) +RUNRUBY = $(RUNRUBY_COMMAND) $(RUN_OPTS) RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args' XRUBY = @XRUBY@ BTESTRUBY = @BTESTRUBY@\ diff --git a/configure.in b/configure.in index 5c69aa1dae..92c9e6ef31 100644 --- a/configure.in +++ b/configure.in @@ -2915,7 +2915,7 @@ else MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.' MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common' PREP='miniruby$(EXEEXT)' - RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)' + RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) --' XRUBY='$(RUNRUBY)' TEST_RUNNABLE=yes CROSS_COMPILING=no |