Skip to content

Commit 470f34d

Browse files
committed
Acquire VS14-compiled builds on Windows
1 parent e01338f commit 470f34d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

utils/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
The discovered distributions are written into `vendor/openssl_distributions.json`. This script does not need to be run unless you are updating the version of OpenSSL to build against.
1515

1616
### acquireOpenSSL
17-
Download the OpenSSL binaries and headers applicable to the current OS for the latest compiler version (clang-9/vs15). Uses links from `vendor/openssl_distributions.json`.
17+
Download the OpenSSL binaries and headers applicable to the current OS for the latest compiler version (clang-9/vs14). Uses links from `vendor/openssl_distributions.json`.
1818

1919
TODO:
2020
* Make the script pull the debug versions if node-gyp is building in debug mode

utils/acquireOpenSSL.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const getOSName = () => {
2020
} else if (process.platform === "darwin") {
2121
return "macOS";
2222
} else {
23-
// We only discover distros for Mac and Windows. We don"t care about any other OS.
23+
// We only discover distros for Mac and Windows. We don't care about any other OS.
2424
return "unknown";
2525
}
2626
};
@@ -29,11 +29,11 @@ const getCompilerVersion = () => {
2929
// TODO: Get actual compiler version. For now, just assume latest compiler for distros in openssl_distributions.js
3030
const osName = getOSName();
3131
if (osName === "win32" || osName === "win64") {
32-
return "vs15";
32+
return "vs14";
3333
} else if (osName === "macOS") {
3434
return "clang-9";
3535
} else {
36-
// We only discover distros for Mac and Windows. We don"t care about any other OS.
36+
// We only discover distros for Mac and Windows. We don't care about any other OS.
3737
return "unknown";
3838
}
3939
};

0 commit comments

Comments
 (0)