[前][次][番号順一覧][スレッド一覧]

ruby-changes:59793

From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Fri, 24 Jan 2020 10:50:58 +0900 (JST)
Subject: [ruby-changes:59793] 3b9f36d6c6 (master): pass appropriate libc path

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

From 3b9f36d6c6a4e02bf6c9bc99e953d5e558ee2fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
 <shyouhei@r...>
Date: Thu, 23 Jan 2020 11:59:37 +0900
Subject: pass appropriate libc path

The same as https://github.com/ruby/ruby/pull/2686, but for musl libc.
Musl is not named as libc.so.6 so the `ldd` hack implemented some lines
below does not work.

diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index 57ded49..348131e 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -17,6 +17,10 @@ when /android/ https://github.com/ruby/ruby/blob/trunk/test/fiddle/helper.rb#L17
   end
   libc_so = File.join(libdir, "libc.so")
   libm_so = File.join(libdir, "libm.so")
+when /linux-musl/
+  Dir.glob('/lib/ld-musl-*.so.1') do |ld|
+    libc_so = libm_so = ld
+  end
 when /linux/
   libdir = '/lib'
   case RbConfig::SIZEOF['void*']
-- 
cgit v0.10.2


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

[前][次][番号順一覧][スレッド一覧]