diff options
| author | Yuta Saito <kateinoigakukun@gmail.com> | 2022-07-30 20:26:57 +0900 |
|---|---|---|
| committer | Yuta Saito <kateinoigakukun@gmail.com> | 2022-08-04 16:29:22 +0900 |
| commit | 00f411c58ac6105f135ff4501ea5bd1d691fcc32 (patch) | |
| tree | f9130f413c1d6342a61ad5a5c5ba1ba831caa509 /ruby.c | |
| parent | 184fd94d7e8023d7720be985089bae00c4bdfa2b (diff) | |
| download | ruby-00f411c58ac6105f135ff4501ea5bd1d691fcc32.tar.gz | |
Add `-bundle_loader` to mjit compilation args on macOS
Diffstat (limited to 'ruby.c')
| -rw-r--r-- | ruby.c | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -22,7 +22,7 @@ # include <sys/cygwin.h> #endif -#if defined(LOAD_RELATIVE) && defined(HAVE_DLADDR) +#if (defined(LOAD_RELATIVE) || defined(__MACH__)) && defined(HAVE_DLADDR) # include <dlfcn.h> #endif @@ -534,7 +534,7 @@ str_conv_enc(VALUE str, rb_encoding *from, rb_encoding *to) void ruby_init_loadpath(void); -#if defined(LOAD_RELATIVE) +#if defined(LOAD_RELATIVE) || defined(__MACH__) static VALUE runtime_libruby_path(void) { @@ -615,6 +615,10 @@ runtime_libruby_path(void) #define INITIAL_LOAD_PATH_MARK rb_intern_const("@gem_prelude_index") VALUE ruby_archlibdir_path, ruby_prefix_path; +#if defined(__MACH__) +// A path to libruby.dylib itself or where it's statically linked to. +VALUE rb_libruby_selfpath; +#endif void ruby_init_loadpath(void) @@ -622,6 +626,14 @@ ruby_init_loadpath(void) VALUE load_path, archlibdir = 0; ID id_initial_load_path_mark; const char *paths = ruby_initial_load_paths; +#if defined(LOAD_RELATIVE) || defined(__MACH__) + VALUE libruby_path = runtime_libruby_path(); +# if defined(__MACH__) + rb_libruby_selfpath = libruby_path; + rb_gc_register_address(&rb_libruby_selfpath); +# endif +#endif + #if defined LOAD_RELATIVE #if !defined ENABLE_MULTIARCH # define RUBY_ARCH_PATH "" @@ -635,7 +647,7 @@ ruby_init_loadpath(void) size_t baselen; const char *p; - sopath = runtime_libruby_path(); + sopath = libruby_path; libpath = RSTRING_PTR(sopath); p = strrchr(libpath, '/'); |