summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-05 16:21:56 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-05 16:21:56 +0000
commit63cbe555b7c040efd335392f31dd99d45e8134db (patch)
tree7d65449f844010cac90a67943ba93b24ebf5a4b6
parenta68c79f7166097daa2a5cd037c04859465c23257 (diff)
* ext/purelib.rb, common.mk: to simulate ruby command more precisely,
remove "." from $: of virtual environment for build and test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk2
-rw-r--r--ext/purelib.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b9e07c55144..cbd952183fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 6 01:14:54 2010 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * ext/purelib.rb, common.mk: to simulate ruby command more precisely,
+ remove "." from $: of virtual environment for build and test.
+
Sat Feb 6 00:02:31 2010 Tanaka Akira <akr@fsij.org>
* random.c (fill_random_seed): don't use O_NOFOLLOW because
diff --git a/common.mk b/common.mk
index 1bce4cf9cd7..559b4908ee8 100644
--- a/common.mk
+++ b/common.mk
@@ -123,7 +123,7 @@ TESTRUN_SCRIPT = $(srcdir)/test.rb
BOOTSTRAPRUBY = $(BASERUBY)
-COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -I. -rrbconfig $(srcdir)/tool/compile_prelude.rb
+COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) -I. -r./rbconfig $(srcdir)/tool/compile_prelude.rb
all: main docs
diff --git a/ext/purelib.rb b/ext/purelib.rb
index 6418fd618d9..cc1a00bdb21 100644
--- a/ext/purelib.rb
+++ b/ext/purelib.rb
@@ -6,7 +6,7 @@ $:.each_with_index {|path, index|
end
}
if nul
- removed, $:[nul..-1] = $:[nul..-1], ["."]
+ removed, $:[nul..-1] = $:[nul..-1], []
if defined?(Gem::QuickLoader)
removed.each do |path|
# replaces a fake rubygems by gem_prelude.rb with an alternative path