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

ruby-changes:66696

From: Nobuyoshi <ko1@a...>
Date: Tue, 6 Jul 2021 09:42:45 +0900 (JST)
Subject: [ruby-changes:66696] eecc4570cd (master): Found library is not usable if the header is not found

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

From eecc4570cd0f775cc83b3ce9c811cd5142e838f2 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Mon, 5 Jul 2021 23:22:44 +0900
Subject: Found library is not usable if the header is not found

---
 ext/zlib/extconf.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index 13d0ee2..d674544 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -10,11 +10,12 @@ require 'rbconfig' https://github.com/ruby/ruby/blob/trunk/ext/zlib/extconf.rb#L10
 
 dir_config 'zlib'
 
-
+libs = $libs
 if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset')} and
     have_header('zlib.h') then
   have_zlib = true
 else
+  $libs = libs
   unless File.directory?(zsrc = "#{$srcdir}/zlib")
     dirs = Dir.open($srcdir) {|z| z.grep(/\Azlib-\d+[.\d]*\z/) {|x|"#{$srcdir}/#{x}"}}
     dirs.delete_if {|x| !File.directory?(x)}
-- 
cgit v1.1


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

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