summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-11 08:57:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-11 08:57:40 +0000
commit121ae83741eac7c823681736851e6d20dd3279c4 (patch)
tree3950bb79b8ba9d9f7db8b75ec1f4ca63104aa938
parente389ce0676d8538dee44e47949bfdef1b81da85f (diff)
* configure.in (MINIRUBY): should not include extension library path.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--common.mk2
-rw-r--r--configure.in3
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index afec7b2780..64b3a963b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 11 17:57:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (MINIRUBY): should not include extension library path.
+
Sun May 11 14:40:36 2008 Tanaka Akira <akr@fsij.org>
* include/ruby/ruby.h (SIZET2NUM): new macro.
diff --git a/common.mk b/common.mk
index b80d829001..2d684ac76c 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 2c51d35ea4..fa1567880b 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