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

ruby-changes:40611

From: naruse <ko1@a...>
Date: Sat, 21 Nov 2015 09:20:57 +0900 (JST)
Subject: [ruby-changes:40611] naruse:r52690 (trunk): Visual C++ 14 (2015) uses ucrtbase.dll as c runtime

naruse	2015-11-21 09:20:53 +0900 (Sat, 21 Nov 2015)

  New Revision: 52690

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52690

  Log:
    Visual C++ 14 (2015) uses ucrtbase.dll as c runtime

  Modified files:
    trunk/test/fiddle/helper.rb
Index: test/fiddle/helper.rb
===================================================================
--- test/fiddle/helper.rb	(revision 52689)
+++ test/fiddle/helper.rb	(revision 52690)
@@ -26,7 +26,8 @@ when /linux/ https://github.com/ruby/ruby/blob/trunk/test/fiddle/helper.rb#L26
   libm_so = File.join(libdir, "libm.so.6")
 when /mingw/, /mswin/
   require "rbconfig"
-  libc_so = libm_so = RbConfig::CONFIG["RUBY_SO_NAME"].split(/-/).find{|e| /^msvc/ =~ e} + ".dll"
+  crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/^msvc\w+/] || 'ucrtbase'
+  libc_so = libm_so = "#{crtname}.dll"
 when /darwin/
   libc_so = "/usr/lib/libc.dylib"
   libm_so = "/usr/lib/libm.dylib"

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

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