From e648fd85b4a03282adcf737fcda89ee28d1b61bd Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Mon, 30 Mar 2020 16:42:54 -0500 Subject: [PATCH] Windows - set ENV['MAKE'] --- dist/index.js | 4 ++++ windows.js | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dist/index.js b/dist/index.js index cc42191..5415640 100644 --- a/dist/index.js +++ b/dist/index.js @@ -4879,6 +4879,8 @@ async function symLinkToEmbeddedMSYS2() { } async function setupMingw(version) { + core.exportVariable('MAKE', 'make.exe') + if (version.startsWith('2.2') || version.startsWith('2.3')) { core.exportVariable('SSL_CERT_FILE', certFile) await installMSYS(version) @@ -4909,6 +4911,8 @@ async function installMSYS(version) { } async function setupMSWin() { + core.exportVariable('MAKE', 'nmake.exe') + // All standard MSVC OpenSSL builds use C:\Program Files\Common Files\SSL const certsDir = 'C:\\Program Files\\Common Files\\SSL\\certs' if (!fs.existsSync(certsDir)) { diff --git a/windows.js b/windows.js index c3a15de..3edef9e 100644 --- a/windows.js +++ b/windows.js @@ -71,6 +71,8 @@ async function symLinkToEmbeddedMSYS2() { } async function setupMingw(version) { + core.exportVariable('MAKE', 'make.exe') + if (version.startsWith('2.2') || version.startsWith('2.3')) { core.exportVariable('SSL_CERT_FILE', certFile) await installMSYS(version) @@ -101,6 +103,8 @@ async function installMSYS(version) { } async function setupMSWin() { + core.exportVariable('MAKE', 'nmake.exe') + // All standard MSVC OpenSSL builds use C:\Program Files\Common Files\SSL const certsDir = 'C:\\Program Files\\Common Files\\SSL\\certs' if (!fs.existsSync(certsDir)) {