diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-12-03 19:41:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-03 19:41:57 +0100 |
| commit | 8dcb5326dd3f5a67d6cd9b0e1b1cb12424a69f2d (patch) | |
| tree | 3aee9f9527060f3c317417af80db7c0473cea5c5 /src/ci | |
| parent | ded98853ec377556112970cb35be4814efa0843e (diff) | |
| parent | 2304c25f31fb69c279110ecaf51627cc36bffd55 (diff) | |
| download | rust-8dcb5326dd3f5a67d6cd9b0e1b1cb12424a69f2d.tar.gz rust-8dcb5326dd3f5a67d6cd9b0e1b1cb12424a69f2d.zip | |
Rollup merge of #66973 - cuviper:min-llvm7, r=alexcrichton
Update the minimum external LLVM to 7 LLVM 7 is over a year old, which should be plenty for compatibility. The last LLVM 6 holdout was llvm-emscripten, which went away in #65501. I've also included a fix for LLVM 8 lacking `MemorySanitizerOptions`, which was broken by #66522.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/azure-pipelines/auto.yml | 2 | ||||
| -rw-r--r-- | src/ci/azure-pipelines/pr.yml | 2 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-llvm-7/Dockerfile (renamed from src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile) | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/ci/azure-pipelines/auto.yml b/src/ci/azure-pipelines/auto.yml index bfe5174bf1e..70d6bad297d 100644 --- a/src/ci/azure-pipelines/auto.yml +++ b/src/ci/azure-pipelines/auto.yml @@ -18,7 +18,7 @@ jobs: - template: steps/run.yml strategy: matrix: - x86_64-gnu-llvm-6.0: + x86_64-gnu-llvm-7: RUST_BACKTRACE: 1 dist-x86_64-linux: {} dist-x86_64-linux-alt: diff --git a/src/ci/azure-pipelines/pr.yml b/src/ci/azure-pipelines/pr.yml index aee4d8d5136..1f0be53677d 100644 --- a/src/ci/azure-pipelines/pr.yml +++ b/src/ci/azure-pipelines/pr.yml @@ -18,7 +18,7 @@ jobs: - template: steps/run.yml strategy: matrix: - x86_64-gnu-llvm-6.0: {} + x86_64-gnu-llvm-7: {} mingw-check: {} x86_64-gnu-tools: CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 diff --git a/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile index 6dbbb220347..a1c9c13fc47 100644 --- a/src/ci/docker/x86_64-gnu-llvm-6.0/Dockerfile +++ b/src/ci/docker/x86_64-gnu-llvm-7/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 RUN apt-get update && apt-get install -y --no-install-recommends \ g++ \ @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ - llvm-6.0-tools \ + llvm-7-tools \ libedit-dev \ libssl-dev \ pkg-config \ @@ -24,7 +24,7 @@ RUN sh /scripts/sccache.sh # using llvm-link-shared due to libffi issues -- see #34486 ENV RUST_CONFIGURE_ARGS \ --build=x86_64-unknown-linux-gnu \ - --llvm-root=/usr/lib/llvm-6.0 \ + --llvm-root=/usr/lib/llvm-7 \ --enable-llvm-link-shared ENV SCRIPT python2.7 ../x.py test src/tools/tidy && python2.7 ../x.py test |