diff options
| author | xtkoba (Tee KOBAYASHI) <xtkoba+ruby@gmail.com> | 2021-06-21 14:44:24 +0200 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-09-20 00:15:30 +0900 |
| commit | 8bda51287865c0d9fe38d7cb39c60070159a6ea3 (patch) | |
| tree | aa4f729f47db19acaac89ede1060c3fd38858c80 /configure.ac | |
| parent | 4705ebd907343cf635cbd9288503653fccf61f0f (diff) | |
MINGW: set rb_cv_msvcrt=ucrt and RT_VER=140 when UCRT is used
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4599
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1112c6f7d0..69abc379ba 100644 --- a/configure.ac +++ b/configure.ac @@ -450,11 +450,13 @@ AS_CASE(["$target_os"], [[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= ]) |