From 0747f94b5f7b7f07f21384507ba1adaea6f99e88 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 27 Sep 2022 18:31:15 +0200 Subject: OpenSSL::config: determine the MSVC target architecture by asking cl Since cl knows what architecture it builds fore, all depending on what the user set up, it makes sense to ask it, and use that result primarly, and only use the POSIX::uname() MACHINE value as a fallback. Also, this does indeed determine if cl is present or not. We drop the explicit names in .github/workflows/windows.yml as proof of concept. Fixes #19281 Reviewed-by: Hugo Landau Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/19285) --- .github/workflows/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 92052cf49b..f5b33dde05 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,9 +22,9 @@ jobs: - windows-2022 platform: - arch: win64 - config: VC-WIN64A enable-fips + config: enable-fips - arch: win32 - config: VC-WIN32 --strict-warnings no-fips + config: --strict-warnings no-fips runs-on: ${{matrix.os}} steps: - uses: actions/checkout@v2 @@ -95,7 +95,7 @@ jobs: - name: config working-directory: _build run: | - perl ..\Configure --banner=Configured no-makedepend no-bulk no-deprecated no-fips no-asm -DOPENSSL_SMALL_FOOTPRINT VC-WIN64A + perl ..\Configure --banner=Configured no-makedepend no-bulk no-deprecated no-fips no-asm -DOPENSSL_SMALL_FOOTPRINT perl configdata.pm --dump - name: build working-directory: _build -- cgit v1.2.3