Windows - set ENV['MAKE']

This commit is contained in:
MSP-Greg
2020-03-31 18:44:54 +02:00
committed by Benoit Daloze
parent fb9d6fbc69
commit e648fd85b4
2 changed files with 8 additions and 0 deletions
Generated Vendored
+4
View File
@@ -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)) {
+4
View File
@@ -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)) {