Skip to content

Commit 4f534ff

Browse files
ci: Use clang as the C++ compiler for x86_64-gnu-debug.
1 parent 9c29517 commit 4f534ff

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/ci/docker/x86_64-gnu-debug/Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:18.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
g++ \
@@ -17,7 +17,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
cmake \
1818
sudo \
1919
gdb \
20-
xz-utils
20+
xz-utils \
21+
lld \
22+
clang
2123

2224
COPY scripts/sccache.sh /scripts/
2325
RUN sh /scripts/sccache.sh
@@ -30,7 +32,11 @@ ENV RUST_CONFIGURE_ARGS \
3032
--enable-debug \
3133
--enable-lld \
3234
--enable-lldb \
33-
--enable-optimize
35+
--enable-optimize \
36+
--set target.x86_64-unknown-linux-gnu.linker=clang \
37+
--set target.x86_64-unknown-linux-gnu.cc=clang \
38+
--set target.x86_64-unknown-linux-gnu.cxx=clang++
39+
3440
ENV SCRIPT \
3541
python2.7 ../x.py build && \
3642
python2.7 ../x.py test src/test/run-make-fulldeps --test-args clang

0 commit comments

Comments
 (0)