diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 14:32:46 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 14:32:46 +0000 |
| commit | 4064ff00f7c26b146a61fdaeb25ee399996459cb (patch) | |
| tree | 6ab56cbe8b0dedd505e3b55d018ef9e40ea92931 | |
| parent | dc11bd92174e7ec783c481af615ae85e934190f3 (diff) | |
| download | ruby-4064ff00f7c26b146a61fdaeb25ee399996459cb.tar.gz ruby-4064ff00f7c26b146a61fdaeb25ee399996459cb.tar.xz ruby-4064ff00f7c26b146a61fdaeb25ee399996459cb.zip | |
* configure.in (setup): add -I$(EXTOUT)/$(arch) to MINIRUBY.
* bootstraptest/runner.rb (main): expand -I directory path.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bootstraptest/runner.rb | 1 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -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 74cb2b9e7..e8651fea4 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 d846a9f18..e32e8e0ba 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 |