mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
b9bac78cce
commit
7d8c42297e
3 changed files with 8 additions and 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>
|
Mon Jan 14 23:28:10 2008 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
* win32/enc-setup.mak (BUILTIN_ENCOBJS): depends on enc/Makefile.in.
|
* win32/enc-setup.mak (BUILTIN_ENCOBJS): depends on enc/Makefile.in.
|
||||||
|
|
|
@ -51,6 +51,7 @@ def main
|
||||||
case arg
|
case arg
|
||||||
when /\A--ruby=(.*)/
|
when /\A--ruby=(.*)/
|
||||||
@ruby = File.expand_path($1)
|
@ruby = File.expand_path($1)
|
||||||
|
@ruby.gsub!(/-I([^ ]*)/){"-I"+File.expand_path($1)}
|
||||||
true
|
true
|
||||||
when /\A--sets=(.*)/
|
when /\A--sets=(.*)/
|
||||||
tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb")
|
tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb")
|
||||||
|
|
|
@ -1374,7 +1374,7 @@ if test x"$cross_compiling" = xyes; then
|
||||||
PREP=fake.rb
|
PREP=fake.rb
|
||||||
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
|
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
|
||||||
else
|
else
|
||||||
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
|
MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I$(EXTOUT)/$(arch)'
|
||||||
PREP='miniruby$(EXEEXT)'
|
PREP='miniruby$(EXEEXT)'
|
||||||
RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
|
RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue