https://git.ruby-lang.org/ruby.git/commit/?id=bcc5a2b67e

From bcc5a2b67eb10836aa54279d88230b3cb349a2e3 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 24 Aug 2021 13:12:06 +0900
Subject: [ruby/fiddle] Simplify libc and libm path logics
 (https://github.com/ruby/fiddle/pull/91)

* 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
---
 test/fiddle/helper.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index a6e2019..f7143f2 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -56,6 +56,8 @@ when /mingw/, /mswin/ https://github.com/ruby/ruby/blob/trunk/test/fiddle/helper.rb#L56
   libc_so = libm_so = "#{crtname}.dll"
 when /darwin/
   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/
   libc_so = "/lib/libc.so.0.1"
   libm_so = "/lib/libm.so.1"
@@ -131,12 +133,9 @@ else https://github.com/ruby/ruby/blob/trunk/test/fiddle/helper.rb#L133
   end
 end
 
-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"
+unless rigid_path
+  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)
 end
 
 if !libc_so || !libm_so
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/