From 9e303c5a6b99c94aad5bb31b3ecdc738d0933a67 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 22 Sep 2021 17:11:32 +0200 Subject: [PATCH] Check STL build in wxMSW cross-compile CI workflow Use --enable-stl for one of the builds (and also --disable-compat30 just to test it too) to check that wxMSW compiles correctly in STL mode too. --- .github/workflows/ci_msw_cross.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml index 0edc18c01e..7da87aca47 100644 --- a/.github/workflows/ci_msw_cross.yml +++ b/.github/workflows/ci_msw_cross.yml @@ -58,9 +58,12 @@ jobs: matrix: include: - name: wxMSW 64 bits + configure_flags: --enable-stl --disable-compat30 - name: wxMSW 32 bits triplet: i686-w64-mingw32 env: + wxCONFIGURE_FLAGS: ${{ matrix.configure_flags }} + # Default to 64-bit build. HOST_TRIPLET: ${{ matrix.triplet || 'x86_64-w64-mingw32' }} @@ -144,7 +147,7 @@ jobs: - name: Configure run: | - ./configure --host=${HOST_TRIPLET} --disable-sys-libs --disable-optimise --disable-debug_info || rc=$? + ./configure --host=${HOST_TRIPLET} --disable-sys-libs --disable-optimise --disable-debug_info $wxCONFIGURE_FLAGS || rc=$? if [ -n "$rc" ]; then echo '*** Configuring failed, contents of config.log follows: ***'