Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-windows-openssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- {ARCH: "win32", RUNNER: "windows-latest"}
- {ARCH: "win64", RUNNER: "windows-latest"}
- {ARCH: "arm64", RUNNER: "windows-11-arm"}
name: "Build OpenSSL for ${{ matrix.ARCH.ARCH }} on MSVC 2022"
name: "Build OpenSSL for ${{ matrix.ARCH.ARCH }} on MSVC"
steps:
- uses: actions/checkout@v6.0.3
with:
Expand Down
24 changes: 18 additions & 6 deletions windows/openssl/build_openssl.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,31 @@ cd openssl-*

SET PATH=%PATH%;C:\Program Files\NASM
SET CL=/FS

REM Locate the Visual Studio install rather than hardcoding a version/edition,
REM so this keeps working as GitHub bumps the runner image (e.g. VS2022 -> VS2026).
REM The GitHub runner images put vswhere on PATH. If that ever stops being true,
REM it's installed by the VS Installer at a fixed location:
REM "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
for /f "usebackq tokens=*" %%i in (`vswhere -latest -products * -property installationPath`) do set VSINSTALL=%%i
if not defined VSINSTALL (
echo Could not locate a Visual Studio installation via vswhere
exit /b 1
)

if "%BUILDARCH%" == "win32" (
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
CALL "%VSINSTALL%\Common7\Tools\VsDevCmd.bat" -arch=x86
CALL "%VSINSTALL%\VC\Auxiliary\Build\vcvarsall.bat" x86

perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN32
) else if "%BUILDARCH%" == "win64" (
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
CALL "%VSINSTALL%\Common7\Tools\VsDevCmd.bat" -arch=x64
CALL "%VSINSTALL%\VC\Auxiliary\Build\vcvarsall.bat" x64

perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN64A
) else if "%BUILDARCH%" == "arm64" (
CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=arm64
CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" arm64
CALL "%VSINSTALL%\Common7\Tools\VsDevCmd.bat" -arch=arm64
CALL "%VSINSTALL%\VC\Auxiliary\Build\vcvarsall.bat" arm64

perl Configure %OPENSSL_BUILD_FLAGS_WINDOWS% VC-WIN64-ARM
)
Expand Down