diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | win32/Makefile.sub | 5 |
5 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Fri Oct 23 07:32:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in, Makefile.in, win32/Makefile.sub (XRUBY): runnable + ruby without current libraries. + + * common.mk (rdoc): use XRUBY. + Fri Oct 23 07:28:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (warnflags): use -Wextra instead of -Wall. diff --git a/Makefile.in b/Makefile.in index 4218ffecc..f328d2ad3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -75,6 +75,7 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) RUBY = $(RUBY_INSTALL_NAME) MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT) RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) -- +XRUBY = @XRUBY@ #### End of system configuration section. #### @@ -350,7 +350,7 @@ post-install-doc:: rdoc: $(PROGRAM) PHONY @echo Generating RDoc documentation - $(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)" + $(XRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)" nodoc: PHONY what-where-doc: no-install-doc diff --git a/configure.in b/configure.in index 7f7a649c9..3a023fdf8 100644 --- a/configure.in +++ b/configure.in @@ -1979,18 +1979,21 @@ if test x"$cross_compiling" = xyes; then test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` "-r'$(arch)-fake' PREP='$(arch)-fake.rb' RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' + XRUBY='$(MINIRUBY)' TEST_RUNNABLE=no else MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb' PREP='miniruby$(EXEEXT)' RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)' + XRUBY='$(RUNRUBY)' TEST_RUNNABLE=yes fi AC_SUBST(TEST_RUNNABLE) AC_SUBST(MINIRUBY) AC_SUBST(PREP) AC_SUBST(RUNRUBY) +AC_SUBST(XRUBY) AC_SUBST(EXTOUT, [${EXTOUT=.ext}]) FIRSTMAKEFILE="" diff --git a/win32/Makefile.sub b/win32/Makefile.sub index b3567af16..680b3dea7 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -254,6 +254,11 @@ RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" !endif MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT) RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- +!if $(CROSS_COMPILING) +XRUBY = $(MINIRUBY) +!else +XRUBY = $(RUNRUBY) +!endif !ifndef RUBY RUBY = ruby !endif |