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

test/fiddle/helper.rb: remove duplication (#3863)

Browse Source
This commit is contained in:
Kenta Murata 2020-12-08 15:42:31 +09:00 committed by GitHub
parent b7dc04e518
commit bd47a8d660
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2020-12-08 15:43:02 +09:00 
Merged-By: mrkn <mrkn@ruby-lang.org>
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/fiddle/helper.rb
View File

@ -55,6 +55,7 @@ when /mingw/, /mswin/
crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase' crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
libc_so = libm_so = "#{crtname}.dll" libc_so = libm_so = "#{crtname}.dll"
when /darwin/ when /darwin/
# macOS 11.0+ removed libSystem.B.dylib from /usr/lib. But It works with dlopen.
libc_so = libm_so = "/usr/lib/libSystem.B.dylib" libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
when /kfreebsd/ when /kfreebsd/
libc_so = "/lib/libc.so.0.1" libc_so = "/lib/libc.so.0.1"
@ -122,11 +123,6 @@ end
libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so)) 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)) 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 if !libc_so || !libm_so
ruby = EnvUtil.rubybin ruby = EnvUtil.rubybin
# When the ruby binary is 32-bit and the host is 64-bit, # When the ruby binary is 32-bit and the host is 64-bit,