[前][次][番号順一覧][スレッド一覧]

ruby-changes:30831

From: nobu <ko1@a...>
Date: Wed, 11 Sep 2013 17:30:56 +0900 (JST)
Subject: [ruby-changes:30831] nobu:r42910 (trunk): configure.in: fix cross-compiling installation failure

nobu	2013-09-11 17:30:48 +0900 (Wed, 11 Sep 2013)

  New Revision: 42910

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42910

  Log:
    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]

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 42909)
+++ configure.in	(revision 42910)
@@ -2915,7 +2915,7 @@ else https://github.com/ruby/ruby/blob/trunk/configure.in#L2915
   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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 42909)
+++ ChangeLog	(revision 42910)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Sep 11 17:30:45 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@g...>
 
 	* thread.c (rb_mutex_unlock): Mutex#unlock no longer raise
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 42909)
+++ Makefile.in	(revision 42910)
@@ -96,7 +96,7 @@ RUBY = $(RUBY_INSTALL_NAME) https://github.com/ruby/ruby/blob/trunk/Makefile.in#L96
 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@\

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]