diff options
| author | Richard Levitte <levitte@openssl.org> | 2022-09-27 18:31:15 +0200 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2022-09-29 13:00:14 +0100 |
| commit | 79eeaf97dd2ab5153875ea92699fe1b421869aa6 (patch) | |
| tree | 7ae13eb08dfc5b63c77959474ab74cbf61db3c4a /.github | |
| parent | ae4fc850a70f34d636024fe7c526d45f58560e6d (diff) | |
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 <hlandau@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19285)
(cherry picked from commit 0747f94b5f7b7f07f21384507ba1adaea6f99e88)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/windows.yml | 6 |
1 files changed, 3 insertions, 3 deletions
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 |