allow cross-compiling openssl for windows

zawata · zawata · commit 4978cbb51646 · 2025-11-13T20:08:13.000-07:00
diff --git a/utils/acquireOpenSSL.mjs b/utils/acquireOpenSSL.mjs
@@ -1,4 +1,5 @@
 import crypto from "crypto";
+import { spawn } from "child_process";
 import execPromise from "./execPromise.js";
 import got from "got";
 import path from "path";
@@ -19,6 +20,8 @@ const vendorPath = path.resolve(import.meta.dirname, "..", "vendor");
 const opensslPatchPath = path.join(vendorPath, "patches", "openssl");
 const extractPath = path.join(vendorPath, "openssl");
 
+const exists = (filePath) => fs.stat(filePath).then(() => true).catch(() => false);
+
 const convertArch = (archStr) => {
   const convertedArch = {
     'ia32': 'x86',
@@ -186,13 +189,7 @@ const buildLinux = async (buildCwd) => {
   }, { pipeOutput: true });
 };
 
-const buildWin32 = async (buildCwd, vsBuildArch) => {
-  if (!vsBuildArch) {
-    throw new Error("Expected vsBuildArch to be specified");
-  }
-
-  const exists = (filePath) => fs.stat(filePath).then(() => true).catch(() => false);
-
+const buildWin32 = async (buildCwd) => {
   let vcvarsallPath = undefined;
 
   if (process.env.npm_config_vcvarsall_path && await exists(process.env.npm_config_vcvarsall_path)) {
@@ -243,34 +240,57 @@ const buildWin32 = async (buildCwd, vsBuildArch) => {
     }
   }
 
-  console.log('using', vcvarsallPath);
-
   let vcTarget;
-  switch (vsBuildArch) {
-    case "x64": {
+  switch (targetArch) {
+    case "x64":
       vcTarget = "VC-WIN64A";
       break;
-    }
 
-    case "x86": {
+    case "x86":
       vcTarget = "VC-WIN32";
       break;
-    }
 
-    case "arm64": {
+    case "arm64":
       vcTarget = "VC-WIN64-ARM";
       break;
-    }
-      
-    default: {
-      throw new Error(`Unknown vsBuildArch: ${vsBuildArch}`);
-    }
   }
 
-  await execPromise(`"${win32BatPath}" "${vcvarsallPath}" ${vsBuildArch} ${vcTarget}`, {
-    cwd: buildCwd,
-    maxBuffer: 10 * 1024 * 1024 // we should really just use spawn
-  }, { pipeOutput: true });
+  let vsBuildArch = hostArch === targetArch
+    ? hostArch
+    : `${hostArch}_${targetArch}`;
+
+  console.log("Using vcvarsall.bat at: ", vcvarsallPath);
+  console.log("Using vsBuildArch: ", vsBuildArch);
+  console.log("Using vcTarget: ", vcTarget);
+
+  await new Promise((resolve, reject) => {
+    const buildProcess = spawn(`"${win32BatPath}" "${vcvarsallPath}" ${vsBuildArch} ${vcTarget}`, {
+      cwd: buildCwd,
+      shell: process.platform === "win32",
+      env: {
+        ...process.env,
+        NODEGIT_SKIP_TESTS: targetArch !== hostArch ? "1" : undefined
+      }
+    });
+
+    buildProcess.stdout.on("data", function(data) {
+      console.info(data.toString().trim());
+    });
+
+    buildProcess.stderr.on("data", function(data) {
+      console.error(data.toString().trim());
+    });
+
+    buildProcess.on("close", function(code) {
+      if (!code) {
+        resolve();
+      } else {
+        reject(code);
+      }
+    });
+  });
+
+  
 };
 
 const removeOpenSSLIfOudated = async (openSSLVersion) => {
@@ -314,8 +334,7 @@ const makeOnStreamDownloadProgress = () => {
 
 const buildOpenSSLIfNecessary = async ({
   macOsDeploymentTarget,
-  openSSLVersion,
-  vsBuildArch
+  openSSLVersion
 }) => {
   if (process.platform !== "darwin" && process.platform !== "win32" && process.platform !== "linux") {
     console.log(`Skipping OpenSSL build, not required on ${process.platform}`);
@@ -359,7 +378,7 @@ const buildOpenSSLIfNecessary = async ({
   } else if (process.platform === "linux") {
     await buildLinux(buildCwd);
   } else if (process.platform === "win32") {
-    await buildWin32(buildCwd, vsBuildArch);
+    await buildWin32(buildCwd);
   } else {
     throw new Error(`Unknown platform: ${process.platform}`);
   }
@@ -474,8 +493,7 @@ const acquireOpenSSL = async () => {
 
     await buildOpenSSLIfNecessary({
       openSSLVersion: OPENSSL_VERSION,
-      macOsDeploymentTarget,
-      vsBuildArch: process.platform === "win32" ? targetArch : undefined
+      macOsDeploymentTarget
     });
     if (process.env.NODEGIT_OPENSSL_BUILD_PACKAGE) {
       await buildPackage();
diff --git a/utils/build-openssl.bat b/utils/build-openssl.bat
@@ -1,9 +1,18 @@
+rem Build OpenSSL for Windows
+rem %1 - path to vcvarsall.bat
+rem %2 - architecture argument for vcvarsall.bat
+rem %3 - OpenSSL Configure target
+
 @call %1 %2
 
 perl .\Configure %3 no-shared no-ssl2 no-ssl3 no-comp --prefix="%cd%\.." --openssldir="%cd%\.." || goto :error
 
 nmake || goto :error
-nmake test || goto :error
+
+if "%NODEGIT_SKIP_TESTS%" NEQ "1" (
+  nmake test || goto :error
+)
+
 nmake install || goto :error
 
 goto :EOF
