diff options
| author | Martin Storsjö <martin@martin.st> | 2024-06-16 23:21:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-16 23:21:51 +0300 |
| commit | 67285feffd6708e6db36c11faf95eeab449e797a (patch) | |
| tree | 59fc81b104b113957188b94bdb12dbfacde0e224 /libcxx/utils | |
| parent | 9f69e116a55dbd36e2f4fde38317de7262c88d7c (diff) | |
| download | llvm-67285feffd6708e6db36c11faf95eeab449e797a.zip llvm-67285feffd6708e6db36c11faf95eeab449e797a.tar.gz llvm-67285feffd6708e6db36c11faf95eeab449e797a.tar.bz2 | |
[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.
Diffstat (limited to 'libcxx/utils')
| -rwxr-xr-x | libcxx/utils/ci/run-buildbot | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot index e40c2b6..f96fc85 100755 --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -703,22 +703,13 @@ clang-cl-static-crt) ;; mingw-dll) clean - # Explicitly specify the compiler with a triple prefix. The CI - # environment has got two installations of Clang; the default one - # defaults to MSVC mode, while there's an installation of llvm-mingw - # further back in PATH. By calling the compiler with an explicit - # triple prefix, we use the one that is bundled with a mingw sysroot. generate-cmake \ - -DCMAKE_C_COMPILER=x86_64-w64-mingw32-clang \ - -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-clang++ \ -C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake" check-runtimes ;; mingw-static) clean generate-cmake \ - -DCMAKE_C_COMPILER=x86_64-w64-mingw32-clang \ - -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-clang++ \ -C "${MONOREPO_ROOT}/libcxx/cmake/caches/MinGW.cmake" \ -DLIBCXX_ENABLE_SHARED=OFF \ -DLIBUNWIND_ENABLE_SHARED=OFF |