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
This commit is contained in:
nobu 2013-09-11 08:30:48 +00:00
Родитель ed6c17f75c
Коммит 5397a25634
3 изменённых файлов: 8 добавлений и 2 удалений

Просмотреть файл

@ -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> Wed Sep 11 07:55:17 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread.c (rb_mutex_unlock): Mutex#unlock no longer raise * thread.c (rb_mutex_unlock): Mutex#unlock no longer raise

Просмотреть файл

@ -96,7 +96,7 @@ RUBY = $(RUBY_INSTALL_NAME)
MINIRUBY = @MINIRUBY@\ MINIRUBY = @MINIRUBY@\
$(MINIRUBYOPT) $(MINIRUBYOPT)
RUNRUBY_COMMAND = @RUNRUBY@ $(RUNRUBYOPT) RUNRUBY_COMMAND = @RUNRUBY@ $(RUNRUBYOPT)
RUNRUBY = $(RUNRUBY_COMMAND) -- $(RUN_OPTS) RUNRUBY = $(RUNRUBY_COMMAND) $(RUN_OPTS)
RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args' RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
XRUBY = @XRUBY@ XRUBY = @XRUBY@
BTESTRUBY = @BTESTRUBY@\ BTESTRUBY = @BTESTRUBY@\

Просмотреть файл

@ -2915,7 +2915,7 @@ else
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.' MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common' MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
PREP='miniruby$(EXEEXT)' PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)' RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) --'
XRUBY='$(RUNRUBY)' XRUBY='$(RUNRUBY)'
TEST_RUNNABLE=yes TEST_RUNNABLE=yes
CROSS_COMPILING=no CROSS_COMPILING=no