1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.ac: use BASERUBY as BOOTSTRAPRUBY if available

Browse Source 
MINIRUBY may not be stable enough to run btest, in developing.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66859 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-01-18 01:55:25 +00:00
parent 6b5695fef9
commit 3c55a0b942
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -3016,6 +3016,7 @@ for var in bindir libdir rubylibprefix; do
done done
BTESTRUBY='$(MINIRUBY)' BTESTRUBY='$(MINIRUBY)'
BOOTSTRAPRUBY='$(BASERUBY)'
AS_IF([test x"$cross_compiling" = xyes], [ AS_IF([test x"$cross_compiling" = xyes], [
test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`$CHDIR .; pwd` "-r'$(arch)-fake' test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`$CHDIR .; pwd` "-r'$(arch)-fake'
XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']` XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']`
@ -3028,7 +3029,6 @@ AS_IF([test x"$cross_compiling" = xyes], [
RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
RUNRUBY='$(RUNRUBY_COMMAND)' RUNRUBY='$(RUNRUBY_COMMAND)'
XRUBY='$(MINIRUBY)' XRUBY='$(MINIRUBY)'
BOOTSTRAPRUBY='$(BASERUBY)'
TEST_RUNNABLE=no TEST_RUNNABLE=no
CROSS_COMPILING=yes CROSS_COMPILING=yes
], [ ], [
@ -3038,7 +3038,7 @@ AS_IF([test x"$cross_compiling" = xyes], [
RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)' RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
RUNRUBY='$(RUNRUBY_COMMAND) --' RUNRUBY='$(RUNRUBY_COMMAND) --'
XRUBY='$(RUNRUBY)' XRUBY='$(RUNRUBY)'
BOOTSTRAPRUBY='$(MINIRUBY)' test "$HAVE_BASERUBY" = yes || BOOTSTRAPRUBY='$(MINIRUBY)'
TEST_RUNNABLE=yes TEST_RUNNABLE=yes
CROSS_COMPILING=no CROSS_COMPILING=no
]) ])