diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-07 02:06:06 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-07 02:06:06 +0000 |
| commit | e9f3a59e85afaf6894cf63bde12d146818715d8a (patch) | |
| tree | a81ab99d0b3c05d0d95c601ad91ff4710628703b | |
| parent | dd939a38869d04be187abd231f18994bed4aa85f (diff) | |
configure.in: BOOTSTRAPRUBY
* configure.in (BOOTSTRAPRUBY): baseruby if cross compiling or
miniruby, anyway runnable ruby command.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 7fb19ded12..bae07737e9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -113,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ XRUBY_LIBDIR = @XRUBY_LIBDIR@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ +BOOTSTRAPRUBY = @BOOTSTRAPRUBY@ #### End of system configuration section. #### @@ -149,8 +149,6 @@ TESTOPTS = $(RUBY_TESTOPTS) TESTRUN_SCRIPT = $(srcdir)/test.rb -BOOTSTRAPRUBY = $(BASERUBY) - COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl all: showflags main docs diff --git a/configure.in b/configure.in index 2896bc2ef9..88a13a3475 100644 --- a/configure.in +++ b/configure.in @@ -3380,6 +3380,7 @@ if test x"$cross_compiling" = xyes; then RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' RUNRUBY='$(RUNRUBY_COMMAND)' XRUBY='$(MINIRUBY)' + BOOTSTRAPRUBY='$(BASERUBY)' TEST_RUNNABLE=no CROSS_COMPILING=yes @@ -3403,6 +3404,7 @@ else RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)' RUNRUBY='$(RUNRUBY_COMMAND) --' XRUBY='$(RUNRUBY)' + BOOTSTRAPRUBY='$(MINIRUBY)' TEST_RUNNABLE=yes CROSS_COMPILING=no fi @@ -3414,6 +3416,7 @@ AC_SUBST(PREP) AC_SUBST(RUNRUBY_COMMAND) AC_SUBST(RUNRUBY) AC_SUBST(XRUBY) +AC_SUBST(BOOTSTRAPRUBY) AC_SUBST(EXTOUT, [${EXTOUT=.ext}]) FIRSTMAKEFILE="" diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 8eade264bf..eea801074d 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -74,7 +74,7 @@ File.foreach "config.status" do |line| if name case name when /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/; next - when /^(?:X|(?:MINI|RUN|(?:HAVE_)?BASE|BTEST)RUBY(?:_COMMAND)?$)/; next + when /^(?:X|(?:MINI|RUN|(?:HAVE_)?BASE|BOOTSTRAP|BTEST)RUBY(?:_COMMAND)?$)/; next when /^INSTALLDOC|TARGET$/; next when /^DTRACE/; next when /^(?:MAJOR|MINOR|TEENY)$/; vars[name] = val; next diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 9165b4d359..c797270255 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -288,7 +288,9 @@ MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT) RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS) !if "$(CROSS_COMPILING)" == "yes" XRUBY = $(MINIRUBY) +BOOTSTRAPRUBY = $(BASERUBY) !else +BOOTSTRAPRUBY = $(MINIRUBY) XRUBY = $(RUNRUBY) !endif BTESTRUBY = $(MINIRUBY) |