mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
ruby.c: moved libdir
* ruby.c (ruby_init_loadpath_safe): moved libdir name inside LOAD_RELATIVE. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
4eb2c1e121
commit
6dafb4c910
1 changed files with 4 additions and 4 deletions
8
ruby.c
8
ruby.c
|
@ -502,6 +502,10 @@ VALUE ruby_archlibdir_path, ruby_prefix_path;
|
||||||
void
|
void
|
||||||
ruby_init_loadpath_safe(int safe_level)
|
ruby_init_loadpath_safe(int safe_level)
|
||||||
{
|
{
|
||||||
|
VALUE load_path, archlibdir = 0;
|
||||||
|
ID id_initial_load_path_mark;
|
||||||
|
const char *paths = ruby_initial_load_paths;
|
||||||
|
#if defined LOAD_RELATIVE
|
||||||
#if !defined ENABLE_MULTIARCH
|
#if !defined ENABLE_MULTIARCH
|
||||||
# define RUBY_ARCH_PATH ""
|
# define RUBY_ARCH_PATH ""
|
||||||
#elif defined RUBY_ARCH
|
#elif defined RUBY_ARCH
|
||||||
|
@ -518,10 +522,6 @@ ruby_init_loadpath_safe(int safe_level)
|
||||||
RUBY_ARCH_PATH;
|
RUBY_ARCH_PATH;
|
||||||
const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir)
|
const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir)
|
||||||
- rb_strlen_lit(RUBY_ARCH_PATH) - 1;
|
- rb_strlen_lit(RUBY_ARCH_PATH) - 1;
|
||||||
VALUE load_path, archlibdir = 0;
|
|
||||||
ID id_initial_load_path_mark;
|
|
||||||
const char *paths = ruby_initial_load_paths;
|
|
||||||
#if defined LOAD_RELATIVE
|
|
||||||
char *libpath;
|
char *libpath;
|
||||||
VALUE sopath;
|
VALUE sopath;
|
||||||
size_t baselen;
|
size_t baselen;
|
||||||
|
|
Loading…
Reference in a new issue