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

ruby-changes:58839

From: Nobuyoshi <ko1@a...>
Date: Tue, 19 Nov 2019 15:13:18 +0900 (JST)
Subject: [ruby-changes:58839] c53aec73dd (master): Configure static extensions only if in charge

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

From c53aec73ddf94bb9a06bead62c3bf58c5ba49bd3 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Tue, 19 Nov 2019 15:06:11 +0900
Subject: Configure static extensions only if in charge

Get rid of races in parallel configuration when using the
ext/Setup file.

diff --git a/ext/extmk.rb b/ext/extmk.rb
index 6045750..80a0a12 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -463,7 +463,11 @@ end unless $extstatic https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L463
 if ARGV[0]
   ext_prefix, exts = ARGV.shift.split('/', 2)
   $extension = [exts] if exts
-  @gemname = exts if ext_prefix == 'gems'
+  if ext_prefix == 'gems'
+    @gemname = exts
+  elsif exts
+    $static_ext.delete_if {|t, *| !File.fnmatch(t, exts)}
+  end
 end
 ext_prefix = "#{$top_srcdir}/#{ext_prefix || 'ext'}"
 exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
-- 
cgit v0.10.2


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

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