From d246303ba7b273e0a1cc79322ca126555a51a415 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Sun, 17 Apr 2022 09:57:34 -0500 Subject: [PATCH] Windows mswin - use ucrt64 tools instead of mingw64 --- common.js | 2 +- dist/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.js b/common.js index 24b0ecb..1b4bc11 100644 --- a/common.js +++ b/common.js @@ -159,7 +159,7 @@ export function win2nix(path) { function rubyIsUCRT(path) { return !!(fs.existsSync(path) && fs.readdirSync(path, { withFileTypes: true }).find(dirent => - dirent.isFile() && dirent.name.match(/^x64-ucrt-ruby\d{3}\.dll$/))) + dirent.isFile() && dirent.name.match(/^x64-(ucrt|vcruntime\d{3})-ruby\d{3}\.dll$/))) } export function setupPath(newPathEntries) { diff --git a/dist/index.js b/dist/index.js index e0441b8..ea5c4a9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -427,7 +427,7 @@ function win2nix(path) { function rubyIsUCRT(path) { return !!(fs.existsSync(path) && fs.readdirSync(path, { withFileTypes: true }).find(dirent => - dirent.isFile() && dirent.name.match(/^x64-ucrt-ruby\d{3}\.dll$/))) + dirent.isFile() && dirent.name.match(/^x64-(ucrt|vcruntime\d{3})-ruby\d{3}\.dll$/))) } function setupPath(newPathEntries) {