Skip to content

Commit 222f9c8

Browse files
Derive 32-bit Linux compiler target from matrix
1 parent 7d8ad6a commit 222f9c8

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ jobs:
3434
{ os: ubuntu-24.04, cxx: g++-12, c: gcc-12, arch: x64, gen: Ninja, cxx_max: 23 },
3535
{ os: ubuntu-24.04, cxx: g++-13, c: gcc-13, arch: x64, gen: Ninja, cxx_max: 23 },
3636
{ os: ubuntu-24.04, cxx: g++-14, c: gcc-14, arch: x64, gen: Ninja, cxx_max: 23 },
37-
{ os: ubuntu-24.04, cxx: g++-14, c: gcc-14, arch: x86, gen: Ninja, cxx_max: 23, c_flags: '-m32', cxx_flags: '-m32', linker_flags: '-m32' },
37+
{ os: ubuntu-24.04, cxx: g++-14, c: gcc-14, arch: x86, gen: Ninja, cxx_max: 23 },
3838
{ os: ubuntu-24.04, cxx: clang++-16, c: clang-16, arch: x64, gen: Ninja, cxx_max: 20 },
3939
{ os: ubuntu-24.04, cxx: clang++-17, c: clang-17, arch: x64, gen: Ninja, cxx_max: 20 },
4040
{ os: ubuntu-24.04, cxx: clang++-18, c: clang-18, arch: x64, gen: Ninja, cxx_max: 23 },
41-
{ os: ubuntu-24.04, cxx: 'clang++-18 --target=i686-linux-gnu', c: 'clang-18 --target=i686-linux-gnu', arch: x86, gen: Ninja, cxx_max: 23 },
41+
{ os: ubuntu-24.04, cxx: clang++-18, c: clang-18, arch: x86, gen: Ninja, cxx_max: 23 },
4242

4343
{ os: windows-2022, cxx: cl, c: cl, arch: x86, gen: Visual Studio 17 2022, cxx_max: 23 },
4444
{ os: windows-2022, cxx: cl, c: cl, arch: x64, gen: Visual Studio 17 2022, cxx_max: 23 },
@@ -57,8 +57,8 @@ jobs:
5757

5858
env:
5959
VAR_CMAKE_FLAGS: |
60-
${{ matrix.env.c && format('-D CMAKE_C_COMPILER=''{0}''', matrix.env.c) }} \
61-
${{ matrix.env.cxx && format('-D CMAKE_CXX_COMPILER=''{0}''', matrix.env.cxx) }} \
60+
${{ matrix.env.c && (contains(matrix.env.os, 'ubuntu') && contains(matrix.env.arch, 'x86') && format('-D CMAKE_C_COMPILER=''{0} {1}''', matrix.env.c, contains(matrix.env.cxx, 'clang') && '--target=i686-linux-gnu' || '-m32') || format('-D CMAKE_C_COMPILER={0}', matrix.env.c)) }} \
61+
${{ matrix.env.cxx && (contains(matrix.env.os, 'ubuntu') && contains(matrix.env.arch, 'x86') && format('-D CMAKE_CXX_COMPILER=''{0} {1}''', matrix.env.cxx, contains(matrix.env.cxx, 'clang') && '--target=i686-linux-gnu' || '-m32') || format('-D CMAKE_CXX_COMPILER={0}', matrix.env.cxx)) }} \
6262
${{ matrix.env.c_flags && format('-D CMAKE_C_FLAGS={0}', matrix.env.c_flags) }} \
6363
${{ matrix.env.cxx_flags && format('-D CMAKE_CXX_FLAGS''={0}''', matrix.env.cxx_flags) }} \
6464
${{ matrix.env.linker_flags && format('-D CMAKE_EXE_LINKER_FLAGS=''{0}''', matrix.env.linker_flags) }} \

0 commit comments

Comments
 (0)