From a855f1059219453866fff8c56cabb4582e346d09 Mon Sep 17 00:00:00 2001 From: Steven King Jr Date: Tue, 2 Oct 2018 14:17:26 -0700 Subject: [PATCH 1/2] Fix incorrect OpenSSL package being pulled down on Windows 32-bit --- utils/acquireOpenSSL.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/acquireOpenSSL.js b/utils/acquireOpenSSL.js index ea33e0c31..2dc54780c 100644 --- a/utils/acquireOpenSSL.js +++ b/utils/acquireOpenSSL.js @@ -12,7 +12,7 @@ const extractPath = path.join(vendorPath, "openssl"); const getOSName = () => { if (process.platform === "win32") { - if (process.arch === "x64" || process.env.hasOwnProperty("PROCESSOR_ARCHITEW6432")) { + if (process.arch === "x64") { return "win64"; } else { return "win32"; From 7f9fcd24a14b7ebf7d01cf6d7b501077cbc97187 Mon Sep 17 00:00:00 2001 From: Steven King Jr Date: Tue, 2 Oct 2018 14:18:28 -0700 Subject: [PATCH 2/2] Fix bad OpenSSL link directory on Windows 32-bit builds --- vendor/libgit2.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index ea6f29cd1..8951b5889 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -549,8 +549,8 @@ "openssl/include" ], "libraries": [ - "openssl/libssl.lib", - "openssl/libcrypto.lib" + "<(module_root_dir)/openssl/lib/libssl.lib", + "<(module_root_dir)/openssl/lib/libcrypto.lib" ] }, { "defines": [