1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby.c: fix compilation error

Browse Source 
* ruby.c (ruby_init_loadpath_safe): fix compilation error when
  ENABLE_MULTIARCH but not universal binary.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-04-27 04:36:34 +00:00
parent 67800ea9c7
commit 4eb2c1e121
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruby.c
View File

@ -502,21 +502,22 @@ VALUE ruby_archlibdir_path, ruby_prefix_path;
void void
ruby_init_loadpath_safe(int safe_level) ruby_init_loadpath_safe(int safe_level)
{ {
#if !defined ENABLE_MULTIARCH
# define RUBY_ARCH_PATH ""
#elif defined RUBY_ARCH
# define RUBY_ARCH_PATH "/"RUBY_ARCH
#else
# define RUBY_ARCH_PATH "/"RUBY_PLATFORM
#endif
static const char libdir[] = "/" static const char libdir[] = "/"
#ifdef LIBDIR_BASENAME #ifdef LIBDIR_BASENAME
LIBDIR_BASENAME LIBDIR_BASENAME
#else #else
"lib" "lib"
#endif #endif
#ifdef ENABLE_MULTIARCH RUBY_ARCH_PATH;
"/"RUBY_ARCH
#endif
;
const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir)
#ifdef ENABLE_MULTIARCH - rb_strlen_lit(RUBY_ARCH_PATH) - 1;
- rb_strlen_lit("/"RUBY_ARCH)
#endif
- 1;
VALUE load_path, archlibdir = 0; VALUE load_path, archlibdir = 0;
ID id_initial_load_path_mark; ID id_initial_load_path_mark;
const char *paths = ruby_initial_load_paths; const char *paths = ruby_initial_load_paths;