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

ruby-changes:68043

From: xtkoba <ko1@a...>
Date: Mon, 20 Sep 2021 00:15:52 +0900 (JST)
Subject: [ruby-changes:68043] 8bda512878 (master): MINGW: set rb_cv_msvcrt=ucrt and RT_VER=140 when UCRT is used

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

From 8bda51287865c0d9fe38d7cb39c60070159a6ea3 Mon Sep 17 00:00:00 2001
From: "xtkoba (Tee KOBAYASHI)" <xtkoba+ruby@g...>
Date: Mon, 21 Jun 2021 14:44:24 +0200
Subject: MINGW: set rb_cv_msvcrt=ucrt and RT_VER=140 when UCRT is used

---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 1112c6f..69abc37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -450,11 +450,13 @@ AS_CASE(["$target_os"], https://github.com/ruby/ruby/blob/trunk/configure.ac#L450
 		    [[FILE* volatile f = stdin; return 0;]])],
 		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
 				   tr A-Z a-z |
-				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
+				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;};
+					/^[[ 	]]*dll name: \(ucrtbase\|api-ms-win-crt-.*\)\.dll$/{s//ucrt/p;q;}'`],
 		    [rb_cv_msvcrt=msvcrt])
 	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
 	RT_VER=`echo "$rb_cv_msvcrt" | tr -cd [0-9]`
 	test "$RT_VER" = "" && RT_VER=60
+	test "$rb_cv_msvcrt" = "ucrt" && RT_VER=140
 	AC_DEFINE_UNQUOTED(RUBY_MSVCRT_VERSION, $RT_VER)
 	sysconfdir=
     ])
-- 
cgit v1.1


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

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