summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-08 07:23:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-08 07:23:13 +0000
commitecc775772ae08fbcf0015b33f2687bbbad051a93 (patch)
treebee8c3c52267ebc96e4ece9137aa7227836ff52a
parent922f3d0bed4d48bc34a9e3ac7daf59a64852de65 (diff)
* 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--ChangeLog7
-rw-r--r--common.mk2
-rwxr-xr-xtool/eval.rb2
-rwxr-xr-xwin32/mkexports.rb2
-rwxr-xr-xwin32/resource.rb2
5 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8db10d9a500..dd142520c5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/common.mk b/common.mk
index 559b4908ee8..0c317569967 100644
--- a/common.mk
+++ b/common.mk
@@ -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 f7299c8b95b..ced244a4da1 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 6ef20eab69e..951429e35ac 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 eda450952bf..786edb0dd65 100755
--- a/win32/resource.rb
+++ b/win32/resource.rb
@@ -1,6 +1,6 @@
#!./miniruby -sI.
-require 'rbconfig'
+require './rbconfig'
CONFIG = RbConfig::MAKEFILE_CONFIG