@@ -223,6 +223,9 @@ jobs:
223223 source .venv/bin/activate
224224 python -m pip install psutil
225225 xcrun bash libcxx/utils/ci/run-buildbot ${{ matrix.config }}
226+ env :
227+ CC : clang
228+ CXX : clang++
226229 - uses : actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
227230 if : always() # Upload artifacts even if the build or test suite fails
228231 with :
@@ -241,16 +244,16 @@ jobs:
241244 fail-fast : false
242245 matrix :
243246 include :
244- - { config: clang-cl-dll, mingw: false }
245- - { config: clang-cl-static, mingw: false }
246- - { config: clang-cl-no-vcruntime, mingw: false }
247- - { config: clang-cl-debug, mingw: false }
248- - { config: clang-cl-static-crt, mingw: false }
249- - { config: mingw-dll, mingw: true }
250- - { config: mingw-static, mingw: true }
251- - { config: mingw-dll-i686, mingw: true }
252- - { config: mingw-incomplete-sysroot, mingw: true }
253- - { config: mingw-static, mingw: true, runner: windows-11-arm }
247+ - { config: clang-cl-dll, mingw: false, cc: clang-cl, cxx: clang-cl }
248+ - { config: clang-cl-static, mingw: false, cc: clang-cl, cxx: clang-cl }
249+ - { config: clang-cl-no-vcruntime, mingw: false, cc: clang-cl, cxx: clang-cl }
250+ - { config: clang-cl-debug, mingw: false, cc: clang-cl, cxx: clang-cl }
251+ - { config: clang-cl-static-crt, mingw: false, cc: clang-cl, cxx: clang-cl }
252+ - { config: mingw-dll, mingw: true, cc: cc, cxx: c++ }
253+ - { config: mingw-dll, mingw: true, cc: i686-w64-mingw32-clang, cxx: i686-w64-mingw32-clang++ }
254+ - { config: mingw-static, mingw: true, cc: cc, cxx: c++ }
255+ - { config: mingw-incomplete-sysroot, mingw: true, cc: cc, cxx: c++ }
256+ - { config: mingw-static, mingw: true, cc: cc, cxx: c++ , runner: windows-11-arm }
254257 runs-on : ${{ matrix.runner != '' && matrix.runner || 'windows-2022' }}
255258 steps :
256259 - uses : actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
@@ -286,5 +289,7 @@ jobs:
286289 run : |
287290 echo "c:\Program Files\LLVM\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
288291 - name : Build and test
289- run : |
290- bash libcxx/utils/ci/run-buildbot ${{ matrix.config }}
292+ run : bash libcxx/utils/ci/run-buildbot ${{ matrix.config }}
293+ env :
294+ CC : ${{ matrix.cc }}
295+ CXX : ${{ matrix.cxx }}
0 commit comments