summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-14 14:32:46 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-14 14:32:46 +0000
commit7d8c42297e38a2e8a719c4775e491de0d49054f1 (patch)
tree6ab56cbe8b0dedd505e3b55d018ef9e40ea92931
parentb9bac78cce93beb9dcde4653af39312ebb29845f (diff)
* configure.in (setup): add -I$(EXTOUT)/$(arch) to MINIRUBY.
* bootstraptest/runner.rb (main): expand -I directory path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--bootstraptest/runner.rb1
-rw-r--r--configure.in2
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e8f2761..d602ecc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 14 23:31:05 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * configure.in (setup): add -I$(EXTOUT)/$(arch) to MINIRUBY.
+
+ * bootstraptest/runner.rb (main): expand -I directory path.
+
Mon Jan 14 23:28:10 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/enc-setup.mak (BUILTIN_ENCOBJS): depends on enc/Makefile.in.
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 74cb2b9..e8651fe 100644
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -51,6 +51,7 @@ def main
case arg
when /\A--ruby=(.*)/
@ruby = File.expand_path($1)
+ @ruby.gsub!(/-I([^ ]*)/){"-I"+File.expand_path($1)}
true
when /\A--sets=(.*)/
tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb")
diff --git a/configure.in b/configure.in
index d846a9f..e32e8e0 100644
--- a/configure.in
+++ b/configure.in
@@ -1374,7 +1374,7 @@ if test x"$cross_compiling" = xyes; then
PREP=fake.rb
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
else
- MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
+ MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/$(arch)'
PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
fi