diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-27 04:36:34 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-04-27 04:36:34 +0000 |
commit | 4eb2c1e1217ac549981cf42b17693d9cc91ba888 (patch) | |
tree | 4241747004b99e34d7abf7e454122a4e890e8072 | |
parent | 67800ea9c785f963701345e516c768b53dd84f82 (diff) | |
download | ruby-4eb2c1e1217ac549981cf42b17693d9cc91ba888.tar.gz |
ruby.c: fix compilation error
* 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
-rw-r--r-- | ruby.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -502,21 +502,22 @@ VALUE ruby_archlibdir_path, ruby_prefix_path; void 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[] = "/" #ifdef LIBDIR_BASENAME LIBDIR_BASENAME #else "lib" #endif -#ifdef ENABLE_MULTIARCH - "/"RUBY_ARCH -#endif - ; + RUBY_ARCH_PATH; const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) -#ifdef ENABLE_MULTIARCH - - rb_strlen_lit("/"RUBY_ARCH) -#endif - - 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; |