aboutsummaryrefslogtreecommitdiffstats
path: root/tool
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-12 15:11:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-12 15:11:10 +0000
commit04e68d0107460575a86cc427338eae436be16286 (patch)
tree21d6239b192f81e58fdfd09959e613dffd79ce9a /tool
parent614619031b6d34d12f7bf2752c24eadefb9a8f8f (diff)
downloadruby-04e68d0107460575a86cc427338eae436be16286.tar.gz
* ruby.c (ruby_init_loadpath_safe): mark initial load paths.
* gem_prelude.rb (push_all_highest_version_gems_on_load_path): search insertion position by initial load path mark. * lib/rubygems.rb (Gem.load_path_insert_index): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/compile_prelude.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/compile_prelude.rb b/tool/compile_prelude.rb
index d13670d955..93a6dd9cf0 100755
--- a/tool/compile_prelude.rb
+++ b/tool/compile_prelude.rb
@@ -48,7 +48,7 @@ class Prelude
key = $1
unless @mkconf
require './rbconfig'
- @mkconf = RbConfig::MAKEFILE_CONFIG.merge('rubylibprefix'=>'#{TMP_RUBY_PREFIX}')
+ @mkconf = RbConfig::MAKEFILE_CONFIG.merge('prefix'=>'#{TMP_RUBY_PREFIX}')
end
if RbConfig::MAKEFILE_CONFIG.has_key? key
val = RbConfig.expand("$(#{key})", @mkconf)