diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-29 21:37:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-29 21:37:48 +0000 |
commit | 65c2fec50cc2da8200489ab95362d3a971cdd64b (patch) | |
tree | a76f418889fab5cfd023cbe0523ae880f999a537 /ruby.c | |
parent | 7ed1803137a8e7757fdb6851e27642c9ceeeffed (diff) | |
download | ruby-65c2fec50cc2da8200489ab95362d3a971cdd64b.tar.gz |
* 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
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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); } |