From a77fb26da8a98b21a7d160f66d74435934910f74 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 21 Nov 2015 00:20:53 +0000 Subject: Visual C++ 14 (2015) uses ucrtbase.dll as c runtime git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/fiddle/helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb index bc98f858ba..e98eecc198 100644 --- a/test/fiddle/helper.rb +++ b/test/fiddle/helper.rb @@ -26,7 +26,8 @@ when /linux/ 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" -- cgit v1.2.3