diff options
| author | bors <bors@rust-lang.org> | 2021-03-04 15:16:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-04 15:16:44 +0000 |
| commit | 409920873cf8a95739a55dc5fe5adb05e1b4758e (patch) | |
| tree | 61f0b6eef6363dc987e6c22c7e1d8f521b321a92 /src/ci/docker/scripts | |
| parent | ec7f258d543e1ac7d0b94435972331e85da8c509 (diff) | |
| parent | ab03c56ba2df69e5c01d2150a319343543a29ba9 (diff) | |
| download | rust-409920873cf8a95739a55dc5fe5adb05e1b4758e.tar.gz rust-409920873cf8a95739a55dc5fe5adb05e1b4758e.zip | |
Auto merge of #81451 - nikic:llvm-12, r=nagisa
Upgrade to LLVM 12 This implements the necessary adjustments to make rustc work with LLVM 12. I didn't encounter any major issues so far. r? `@cuviper`
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/cmake.sh | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/ci/docker/scripts/cmake.sh b/src/ci/docker/scripts/cmake.sh new file mode 100755 index 00000000000..70096173403 --- /dev/null +++ b/src/ci/docker/scripts/cmake.sh @@ -0,0 +1,34 @@ +#!/bin/bash +set -ex + +hide_output() { + set +x + on_err=" +echo ERROR: An error was encountered with the build. +cat /tmp/build.log +exit 1 +" + trap "$on_err" ERR + bash -c "while true; do sleep 30; echo \$(date) - building ...; done" & + PING_LOOP_PID=$! + "$@" &> /tmp/build.log + trap - ERR + kill $PING_LOOP_PID + rm /tmp/build.log + 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 +curl -L https://github.com/Kitware/CMake/releases/download/v$CMAKE/cmake-$CMAKE.tar.gz | tar xzf - + +mkdir cmake-build +cd cmake-build +hide_output ../cmake-$CMAKE/configure +hide_output make -j$(nproc) +hide_output make install + +cd .. +rm -rf cmake-build +rm -rf cmake-$CMAKE |
