diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-01-25 12:49:01 -0600 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-01-25 13:49:54 -0800 |
| commit | 8a9381db01c71851654e445e7f2d81786fc80ecd (patch) | |
| tree | 133465413a64b18bbe2bf90eb71bf25220dfab6d /src/ci/docker | |
| parent | f7706d5816b48a9dcc31b06472ecb630eab2ea44 (diff) | |
| parent | e9a64996bedbc224d1edb401162d2c3cc15eb7c1 (diff) | |
| download | rust-8a9381db01c71851654e445e7f2d81786fc80ecd.tar.gz rust-8a9381db01c71851654e445e7f2d81786fc80ecd.zip | |
Rollup merge of #47710 - alexcrichton:llvm-6-compat, r=nikomatsakis
First round of LLVM 6.0.0 compatibility This includes a number of commits for the first round of upgrading to LLVM 6. There are still [lingering bugs](https://github.com/rust-lang/rust/issues/47683) but I believe all of this will nonetheless be necessary!
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/dist-i686-freebsd/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/dist-x86_64-freebsd/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/dist-i686-freebsd/Dockerfile b/src/ci/docker/dist-i686-freebsd/Dockerfile index 686afc97289..673fa4c0c4b 100644 --- a/src/ci/docker/dist-i686-freebsd/Dockerfile +++ b/src/ci/docker/dist-i686-freebsd/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 RUN apt-get update && apt-get install -y --no-install-recommends \ clang \ diff --git a/src/ci/docker/dist-x86_64-freebsd/Dockerfile b/src/ci/docker/dist-x86_64-freebsd/Dockerfile index 7483d395622..f9f5b7062f8 100644 --- a/src/ci/docker/dist-x86_64-freebsd/Dockerfile +++ b/src/ci/docker/dist-x86_64-freebsd/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 RUN apt-get update && apt-get install -y --no-install-recommends \ clang \ |