From aef55b37c6853a83aba7bd15be8038aac829c9b0 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 11 May 2008 08:57:40 +0000 Subject: * configure.in (MINIRUBY): should not include extension library path. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ common.mk | 2 +- configure.in | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index afec7b278..64b3a963b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun May 11 17:57:36 2008 Nobuyoshi Nakada + + * configure.in (MINIRUBY): should not include extension library path. + Sun May 11 14:40:36 2008 Tanaka Akira * include/ruby/ruby.h (SIZET2NUM): new macro. diff --git a/common.mk b/common.mk index b80d82900..2d684ac76 100644 --- a/common.mk +++ b/common.mk @@ -330,7 +330,7 @@ clean-enc: distclean: distclean-ext distclean-local distclean-enc distclean-local:: clean-local - @$(RM) $(MKFILES) config.h rbconfig.rb yasmdata.rb encdb.h + @$(RM) $(MKFILES) $(arch_hdrdir)/ruby/config.h rbconfig.rb yasmdata.rb encdb.h @$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES) @$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP) distclean-ext: diff --git a/configure.in b/configure.in index 2c51d35ea..fa1567880 100644 --- a/configure.in +++ b/configure.in @@ -1488,8 +1488,7 @@ if test x"$cross_compiling" = xyes; then RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' else MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' - MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/$(arch) -I$(EXTOUT)/common' - MINIRUBY="$MINIRUBY"' -I./- -I$(srcdir)/ext -rpurelib.rb' + MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb' PREP='miniruby$(EXEEXT)' RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)' fi -- cgit