diff options
| author | bors <bors@rust-lang.org> | 2023-07-17 15:46:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-17 15:46:43 +0000 |
| commit | c4e6fe9240a8aaff8e7eb42acc4cab33fe2e3707 (patch) | |
| tree | a5cc8875633430f6237b01ab19372c56c693087e /src/ci/docker/scripts | |
| parent | b3c7a7e749761b61ee587fda5fa24aae444865e9 (diff) | |
| parent | e95caa7b7276a9b7d57fb5cea544176d70623db5 (diff) | |
| download | rust-c4e6fe9240a8aaff8e7eb42acc4cab33fe2e3707.tar.gz rust-c4e6fe9240a8aaff8e7eb42acc4cab33fe2e3707.zip | |
Auto merge of #113714 - Kobzol:ci-cmake, r=nikic
CI: build CMake 3.20 to support LLVM 17 LLVM 17 will require CMake at least 3.20, so we have to go back to building our own CMake on the Linux x64 dist builder. r? `@nikic`
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/cmake.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/scripts/cmake.sh b/src/ci/docker/scripts/cmake.sh index f124dbdaa6d..822666c8953 100755 --- a/src/ci/docker/scripts/cmake.sh +++ b/src/ci/docker/scripts/cmake.sh @@ -18,9 +18,9 @@ exit 1 set -x } -# LLVM 12 requires CMake 3.13.4 or higher. -# This script is not necessary for images using Ubuntu 20.04 or newer. -CMAKE=3.13.4 +# LLVM 17 requires CMake 3.20 or higher. +# This script is not necessary for images using Ubuntu 22.04 or newer. +CMAKE=3.20.3 curl -L https://github.com/Kitware/CMake/releases/download/v$CMAKE/cmake-$CMAKE.tar.gz | tar xzf - mkdir cmake-build |