From 65c2fec50cc2da8200489ab95362d3a971cdd64b Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 29 Jun 2011 21:37:48 +0000 Subject: * ruby.c (ruby_init_loadpath_safe): ensure RUBYLIB_PREFIX stored before RUBYLIB, even if MANGLED_PATH is enabled. fixed #1679. MANGLED_PATH is disabled by the default and will be removed completely in the future. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ruby.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index d04cafe6ca..2de211654d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 30 06:37:43 2011 Nobuyoshi Nakada + + * ruby.c (ruby_init_loadpath_safe): ensure RUBYLIB_PREFIX stored + before RUBYLIB, even if MANGLED_PATH is enabled. fixed #1679. + MANGLED_PATH is disabled by the default and will be removed + completely in the future. + Thu Jun 30 06:32:21 2011 Eric Hodel * lib/drb/drb.rb: Hide deprecated toplevel DRb constants. diff --git a/ruby.c b/ruby.c index cb27d163a5..86cb0b08a5 100644 --- a/ruby.c +++ b/ruby.c @@ -441,6 +441,9 @@ ruby_init_loadpath_safe(int safe_level) load_path = GET_VM()->load_path; if (safe_level == 0) { +#ifdef MANGLED_PATH + rubylib_mangled_path("", 0); +#endif ruby_push_include(getenv("RUBYLIB"), identical_path); } -- cgit v1.2.3