diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-08 07:23:13 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-08 07:23:13 +0000 |
commit | ecc775772ae08fbcf0015b33f2687bbbad051a93 (patch) | |
tree | bee8c3c52267ebc96e4ece9137aa7227836ff52a | |
parent | 922f3d0bed4d48bc34a9e3ac7daf59a64852de65 (diff) | |
download | ruby-ecc775772ae08fbcf0015b33f2687bbbad051a93.tar.gz |
* common.mk (COMPILE_PRELUDE): rbconfig is loaded on demand.
* tool/eval.rb, win32/{mkexports,resource}.rb: miniruby no longer
contains "." in $:.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | common.mk | 2 | ||||
-rwxr-xr-x | tool/eval.rb | 2 | ||||
-rwxr-xr-x | win32/mkexports.rb | 2 | ||||
-rwxr-xr-x | win32/resource.rb | 2 |
5 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Mon Feb 8 16:23:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (COMPILE_PRELUDE): rbconfig is loaded on demand. + + * tool/eval.rb, win32/{mkexports,resource}.rb: miniruby no longer + contains "." in $:. + Mon Feb 8 10:28:58 2010 Yukihiro Matsumoto <matz@ruby-lang.org> * configure.in: check pthread_attr_getstack to prevent obsolete @@ -123,7 +123,7 @@ TESTRUN_SCRIPT = $(srcdir)/test.rb BOOTSTRAPRUBY = $(BASERUBY) -COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -I. -r./rbconfig $(srcdir)/tool/compile_prelude.rb +COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb all: main docs diff --git a/tool/eval.rb b/tool/eval.rb index f7299c8b95..ced244a4da 100755 --- a/tool/eval.rb +++ b/tool/eval.rb @@ -1,5 +1,5 @@ -require 'rbconfig' +require './rbconfig' require 'fileutils' require 'pp' diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 6ef20eab69..951429e35a 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -3,7 +3,7 @@ $name = $library = $description = nil module RbConfig - autoload :CONFIG, "rbconfig" + autoload :CONFIG, "./rbconfig" end class Exports diff --git a/win32/resource.rb b/win32/resource.rb index eda450952b..786edb0dd6 100755 --- a/win32/resource.rb +++ b/win32/resource.rb @@ -1,6 +1,6 @@ #!./miniruby -sI. -require 'rbconfig' +require './rbconfig' CONFIG = RbConfig::MAKEFILE_CONFIG |