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

[ruby/fiddle] Simplify libc and libm path logics (https://github.com/ruby/fiddle/pull/91)

Browse Source 
* Simplify libc_so and libm_so

If nil, no need to set to nil.

* Get rid of repeating inversions

https://github.com/ruby/fiddle/commit/4323e689d8
This commit is contained in:
Nobuyoshi Nakada 2021-08-24 13:12:06 +09:00
parent 0f1e8f38c9
commit bcc5a2b67e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/fiddle/helper.rb
View File

@ -56,6 +56,8 @@ when /mingw/, /mswin/
libc_so = libm_so = "#{crtname}.dll" libc_so = libm_so = "#{crtname}.dll"
when /darwin/ when /darwin/
libc_so = libm_so = "/usr/lib/libSystem.B.dylib" libc_so = libm_so = "/usr/lib/libSystem.B.dylib"
# macOS 11.0+ removed libSystem.B.dylib from /usr/lib. But It works with dlopen.
rigid_path = true
when /kfreebsd/ when /kfreebsd/
libc_so = "/lib/libc.so.0.1" libc_so = "/lib/libc.so.0.1"
libm_so = "/lib/libm.so.1" libm_so = "/lib/libm.so.1"
@ -131,12 +133,9 @@ else
end end
end end
libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so)) unless rigid_path
libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_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)
# 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 end
if !libc_so || !libm_so if !libc_so || !libm_so