try using jom for parallel windows compilation (#649)

* try using jom for parallel windows compilation * try removing -j4
pyca · Nov 28, 2024 · 3b3ec81 · 3b3ec81
1 parent f351549
commit 3b3ec81
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/build-windows-openssl.yml b/.github/workflows/build-windows-openssl.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/[email protected]
         with:
           persist-credentials: false
-      - run: choco install -y nasm winrar
+      - run: choco install -y nasm winrar jom
       - name: Export OpenSSL version
         run: |
           source ./cryptography-linux/openssl-version.sh

diff --git a/windows/openssl/build_openssl_win32.bat b/windows/openssl/build_openssl_win32.bat
@@ -1,9 +1,10 @@
 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x86
 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86
 SET PATH=%PATH%;C:\Program Files\NASM
+SET CL=/FS
 
 perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN32
-nmake
+jom
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 mkdir ..\build

diff --git a/windows/openssl/build_openssl_win64.bat b/windows/openssl/build_openssl_win64.bat
@@ -1,9 +1,10 @@
 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x64
 call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
 SET PATH=%PATH%;C:\Program Files\NASM
+SET CL=/FS
 
 perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN64A
-nmake
+jom
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 mkdir ..\build