Skip to content

Commit 9bf69c9

Browse files
committed
Fix pathing and ia32 detection for openssl dependency on win32
1 parent 429e135 commit 9bf69c9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

utils/acquireOpenSSL.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const extractPath = path.join(vendorPath, "openssl");
1212

1313
const getOSName = () => {
1414
if (process.platform === "win32") {
15-
if (process.arch === "x64" || process.env.hasOwnProperty("PROCESSOR_ARCHITEW6432")) {
15+
if (process.arch === "x64") {
1616
return "win64";
1717
} else {
1818
return "win32";

vendor/libgit2.gyp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,8 @@
549549
"openssl/include"
550550
],
551551
"libraries": [
552-
"openssl/libssl.lib",
553-
"openssl/libcrypto.lib"
552+
"<(module_root_dir)/vendor/openssl/lib/libssl.lib",
553+
"<(module_root_dir)/vendor/openssl/lib/libcrypto.lib"
554554
]
555555
}, {
556556
"defines": [

0 commit comments

Comments
 (0)