Skip to content

Commit 36b5789

Browse files
committed
mingw
1 parent b962d6c commit 36b5789

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/CI-mingw.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: windows-2025
3333

3434
env:
35-
CXX: ${{ matrix.compiler }}
35+
CXX: ${{ matrix.pkg-prefix }}${{ matrix.compiler }}
3636

3737
steps:
3838
- uses: actions/checkout@v4
@@ -53,11 +53,12 @@ jobs:
5353
5454
- name: install compiler
5555
run: |
56+
pacman -S --noconfirm ${{ matrix.pkg-prefix }}${{ matrix.compiler-pkg }}
5657
# clang is required to run-tests.py
57-
pacman -S --noconfirm ${{ matrix.pkg-prefix }}${{ matrix.compiler-pkg }} clang
58+
pacman -S --noconfirm clang
5859
5960
- name: install libc++
60-
if: matrix.compiler == 'clang++'
61+
if: matrix.compiler == 'clang++' && matrix.pkg-prefix != ''
6162
run: |
6263
pacman -S --noconfirm ${{ matrix.pkg-prefix }}libc++
6364
@@ -91,7 +92,7 @@ jobs:
9192
make -j$(nproc) test selfcheck CXXOPTS="-Werror -g3 -D_GLIBCXX_DEBUG"
9293
9394
- name: Run with libc++ hardening mode
94-
if: matrix.compiler == 'clang++'
95+
if: matrix.compiler == 'clang++' && matrix.pkg-prefix != ''
9596
run: |
9697
make clean
9798
make -j$(nproc) test selfcheck CXXOPTS="-Werror -stdlib=libc++ -g3 -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG" LDOPTS="-lc++"

0 commit comments

Comments
 (0)