Skip to content

Commit

Permalink
merge revision(s) 0168094,cdef17096c03099f17ecf0af51f43faa0944f96d,b7…
Browse files Browse the repository at this point in the history
…d86e330c76b4f9615511307e1c40f4f2937c83:

	Use libSystem.dylib instead of libm.dylib and libc.dylib

	  Because macOS 11.0(Big Sur) was removed libc and libm from `/usr/lib`.

	libSystem.dylib is also symlink. Use libSystem.B.dylib

	Workaroud for macOS Big Sur(11.0)
  • Loading branch information
nagachika committed Oct 1, 2020
1 parent b35bfa6 commit 5445e04
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions test/fiddle/helper.rb
Expand Up @@ -43,8 +43,7 @@
crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
libc_so = libm_so = "#{crtname}.dll"
when /darwin/
libc_so = "/usr/lib/libc.dylib"
libm_so = "/usr/lib/libm.dylib"
libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
when /kfreebsd/
libc_so = "/lib/libc.so.0.1"
libm_so = "/lib/libm.so.1"
Expand Down Expand Up @@ -111,6 +110,11 @@
libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so))
libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_so))

# macOS 11.0+ removed libSystem.B.dylib from /usr/lib. But It works with dlopen.
if RUBY_PLATFORM =~ /darwin/
libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
end

if !libc_so || !libm_so
ruby = EnvUtil.rubybin
# When the ruby binary is 32-bit and the host is 64-bit,
Expand Down
2 changes: 1 addition & 1 deletion version.h
Expand Up @@ -2,7 +2,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 2
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 136
#define RUBY_PATCHLEVEL 137

#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 10
Expand Down

0 comments on commit 5445e04

Please sign in to comment.