diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Thu Mar 4 22:31:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in: miniruby is not needed for cross compile. + + * configure.in (PREP): miniruby for native compile. + Thu Mar 4 11:46:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/drb/extservm.rb (DRb::ExtServManager#invoke_service_command): diff --git a/Makefile.in b/Makefile.in index b616bef80f..652ab28e5c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -121,14 +121,14 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --make-flags="$(MAKEFLAGS)" EXTMK_ARGS = $(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) -- -all: @MAKEFILES@ miniruby$(EXEEXT) rbconfig.rb $(LIBRUBY) +all: @MAKEFILES@ $(PREP) rbconfig.rb $(LIBRUBY) @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(DMYEXT) @rm -f $@ $(PURIFY) $(CC) $(LDFLAGS) $(MAINLIBS) $(MAINOBJ) $(LIBRUBY_A) $(LIBS) -o $@ -$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) $(SETUP) miniruby$(EXEEXT) +$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) $(SETUP) $(PREP) @rm -f $@ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ @@ -144,7 +144,7 @@ $(LIBRUBY_A): $(OBJS) $(DMYEXT) @AR@ rcu $@ $(OBJS) $(DMYEXT) @-@RANLIB@ $@ 2> /dev/null || true -$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) miniruby$(EXEEXT) $(PREP) $(ARCHFILE) +$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(PREP) $(ARCHFILE) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) -o $@ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ File.symlink "$(LIBRUBY_SO)", link}' \ @@ -210,10 +210,10 @@ extconf: $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) -rbconfig.rb: miniruby$(EXEEXT) $(srcdir)/mkconfig.rb config.status $(PREP) +rbconfig.rb: $(srcdir)/mkconfig.rb config.status $(PREP) @$(MINIRUBY) $(srcdir)/mkconfig.rb rbconfig.rb -fake.rb: miniruby$(EXEEXT) Makefile +fake.rb: Makefile @echo ' \ class Object; \ CROSS_COMPILING = RUBY_PLATFORM; \ diff --git a/configure.in b/configure.in index 9ea1bb1efb..48ee05b2e0 100644 --- a/configure.in +++ b/configure.in @@ -1112,7 +1112,7 @@ if test x"$cross_compiling" = xyes; then RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' else MINIRUBY='./miniruby$(EXEEXT)' - PREP='' + PREP='$(MINIRUBY)' RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT) --' fi AC_SUBST(MINIRUBY) |