From 63cbe555b7c040efd335392f31dd99d45e8134db Mon Sep 17 00:00:00 2001 From: mame Date: Fri, 5 Feb 2010 16:21:56 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ common.mk | 2 +- ext/purelib.rb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9e07c5514..cbd952183f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 6 01:14:54 2010 Yusuke Endoh + + * 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 * random.c (fill_random_seed): don't use O_NOFOLLOW because diff --git a/common.mk b/common.mk index 1bce4cf9cd..559b4908ee 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 6418fd618d..cc1a00bdb2 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