From ffd46bd1d2aab721f55bd8861a8d066deda0a483 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Mon, 22 Nov 2021 13:36:19 -0600 Subject: [PATCH] Only install mingw or ucrt for new Rubies --- windows.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/windows.js b/windows.js index 60e432e..d8ee6bc 100644 --- a/windows.js +++ b/windows.js @@ -60,11 +60,14 @@ export async function install(platform, engine, version) { const winMSYS2Type = common.setupPath([`${rubyPrefix}\\bin`, ...toolchainPaths]) + // install msys2 tools for all versions, only install mingw or ucrt for Rubies >= 2.4 + if (!['windows-2019', 'windows-2016'].includes(virtualEnv)) { await installMSY2Tools() } - if (( winMSYS2Type === 'ucrt64') || !['windows-2019', 'windows-2016'].includes(virtualEnv)) { + if ((( winMSYS2Type === 'ucrt64') || !['windows-2019', 'windows-2016'].includes(virtualEnv)) && + (common.floatVersion(version) >= 2.4)) { await installGCCTools(winMSYS2Type) }