Skip to content

Commit 67285fe

Browse files
authored
[libcxx] [ci] Simplify the mingw x86_64 configs (#95609)
Since switching the Windows CI environment over to GitHub Actions runners, the mingw tests run in a setup where the default compiler binary is a mingw-targeting compiler, so we don't need to specify a custom executable name. For the i686 tests, we still specify a custom compiler name, in order to target i686 instead of x86_64.
1 parent 9f69e11 commit 67285fe

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

libcxx/utils/ci/run-buildbot

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -703,22 +703,13 @@ clang-cl-static-crt)
703703
;;
704704
mingw-dll)
705705
clean
706-
# Explicitly specify the compiler with a triple prefix. The CI
707-
# environment has got two installations of Clang; the default one
708-
# defaults to MSVC mode, while there's an installation of llvm-mingw
709-
# further back in PATH. By calling the compiler with an explicit
710-
# triple prefix, we use the one that is bundled with a mingw sysroot.
711706
generate-cmake \
712-
-DCMAKE_C_COMPILER=x86_64-w64-mingw32-clang \
713-
-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-clang++ \
714707
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake"
715708
check-runtimes
716709
;;
717710
mingw-static)
718711
clean
719712
generate-cmake \
720-
-DCMAKE_C_COMPILER=x86_64-w64-mingw32-clang \
721-
-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-clang++ \
722713
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake" \
723714
-DLIBCXX_ENABLE_SHARED=OFF \
724715
-DLIBUNWIND_ENABLE_SHARED=OFF

0 commit comments

Comments
 (0)