diff options
| author | Michael Woerister <michaelwoerister@posteo> | 2019-01-28 15:16:29 +0100 |
|---|---|---|
| committer | Michael Woerister <michaelwoerister@posteo> | 2019-01-30 16:21:43 +0100 |
| commit | 4f534ffbdb9bb9897ea6a1f7290e5e6fb4d86f02 (patch) | |
| tree | 049483554df36c4943ab75e9569715ca0611675a /src/ci | |
| parent | 9c29517af9cc44683fabcdf8c4b9b9c650e33ca6 (diff) | |
| download | rust-4f534ffbdb9bb9897ea6a1f7290e5e6fb4d86f02.tar.gz rust-4f534ffbdb9bb9897ea6a1f7290e5e6fb4d86f02.zip | |
ci: Use clang as the C++ compiler for x86_64-gnu-debug.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/x86_64-gnu-debug/Dockerfile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/ci/docker/x86_64-gnu-debug/Dockerfile b/src/ci/docker/x86_64-gnu-debug/Dockerfile index 1f2cdf36d15..10d92256dcc 100644 --- a/src/ci/docker/x86_64-gnu-debug/Dockerfile +++ b/src/ci/docker/x86_64-gnu-debug/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.10 RUN apt-get update && apt-get install -y --no-install-recommends \ g++ \ @@ -17,7 +17,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ sudo \ gdb \ - xz-utils + xz-utils \ + lld \ + clang COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh @@ -30,7 +32,11 @@ ENV RUST_CONFIGURE_ARGS \ --enable-debug \ --enable-lld \ --enable-lldb \ - --enable-optimize + --enable-optimize \ + --set target.x86_64-unknown-linux-gnu.linker=clang \ + --set target.x86_64-unknown-linux-gnu.cc=clang \ + --set target.x86_64-unknown-linux-gnu.cxx=clang++ + ENV SCRIPT \ python2.7 ../x.py build && \ python2.7 ../x.py test src/test/run-make-fulldeps --test-args clang |