@@ -2,18 +2,18 @@ FROM ubuntu:18.04
2
2
3
3
# Install build dependencies
4
4
RUN apt-get update && apt-get install -y \
5
- clang-5 .0 \
6
- clang-format-5 .0 \
7
- clang-tools-5 .0 \
8
- clang-tidy-5 .0 \
5
+ clang-6 .0 \
6
+ clang-format-6 .0 \
7
+ clang-tools-6 .0 \
8
+ clang-tidy-6 .0 \
9
9
cmake \
10
- libclang-5 .0-dev \
10
+ libclang-6 .0-dev \
11
11
libfile-spec-native-perl \
12
12
libgtest-dev
13
13
14
14
# Set up clang compilers
15
- ENV CC=/usr/lib/llvm-5 .0/bin/clang \
16
- CXX=/usr/lib/llvm-5 .0/bin/clang++
15
+ ENV CC=/usr/lib/llvm-6 .0/bin/clang \
16
+ CXX=/usr/lib/llvm-6 .0/bin/clang++
17
17
18
18
# Fix issues with gtest installation from ubuntu debian
19
19
RUN cd /usr/src/gtest && \
@@ -23,17 +23,17 @@ RUN cd /usr/src/gtest && \
23
23
24
24
# Fix issues with clang installation from ubuntu debian
25
25
RUN mkdir -p /usr/lib/cmake && \
26
- ln -s /usr/share/llvm-5 .0/cmake /usr/lib/cmake/clang && \
27
- for hdr in /usr/lib/llvm-5 .0/include/clang/*; do \
26
+ ln -s /usr/share/llvm-6 .0/cmake /usr/lib/cmake/clang && \
27
+ for hdr in /usr/lib/llvm-6 .0/include/clang/*; do \
28
28
ln -s $hdr /usr/include/clang/$(basename $hdr); \
29
29
done && \
30
- ln -s /usr/lib/llvm-5 .0/include/clang-c /usr/include/clang-c && \
31
- ln -s /usr/lib/llvm-5 .0/include/llvm /usr/include/llvm && \
32
- ln -s /usr/lib/llvm-5 .0/include/llvm-c /usr/include/llvm-c && \
33
- for lib in /usr/lib/llvm-5 .0/lib/*; do \
30
+ ln -s /usr/lib/llvm-6 .0/include/clang-c /usr/include/clang-c && \
31
+ ln -s /usr/lib/llvm-6 .0/include/llvm /usr/include/llvm && \
32
+ ln -s /usr/lib/llvm-6 .0/include/llvm-c /usr/include/llvm-c && \
33
+ for lib in /usr/lib/llvm-6 .0/lib/*; do \
34
34
ln -s $lib /usr/lib/$(basename $lib); \
35
35
done && \
36
- for bin in /usr/bin/*-5 .0; do \
36
+ for bin in /usr/bin/*-6 .0; do \
37
37
ln -s $bin /usr/bin/$(basename $bin | rev | cut -d '-' -f2- | rev); \
38
38
done
39
39
@@ -42,18 +42,18 @@ WORKDIR clangmetatool
42
42
43
43
# Build tool, run tests, and do a test install
44
44
RUN mkdir build && cd build && \
45
- cmake -DClang_DIR=/usr/share/llvm-5 .0/cmake .. && \
45
+ cmake -DClang_DIR=/usr/share/llvm-6 .0/cmake .. && \
46
46
make all test && \
47
47
make install && \
48
48
cd .. && rm -rf build
49
49
50
50
# Fix includes for clangmetatool (due to ubuntu debian's clang)
51
- RUN ln -s /usr/lib/llvm-5 .0/include/clangmetatool /usr/include/clangmetatool
51
+ RUN ln -s /usr/lib/llvm-6 .0/include/clangmetatool /usr/include/clangmetatool
52
52
53
53
# Build skeleton
54
54
RUN mkdir skeleton/build && cd skeleton/build && \
55
- cmake -DClang_DIR=/usr/share/llvm-5 .0/cmake \
56
- -Dclangmetatool_DIR=/usr/share/llvm-5 .0/cmake .. && \
55
+ cmake -DClang_DIR=/usr/share/llvm-6 .0/cmake \
56
+ -Dclangmetatool_DIR=/usr/share/llvm-6 .0/cmake .. && \
57
57
make all && \
58
58
make install && \
59
59
cd - && rm -rf skeleton/build
0 commit comments