Skip to content

Commit 7f7ea68

Browse files
authored
Update clang to 17 in short integration test image (#33)
Updating `slang` requires `C++20`. Compiling with `C++20` fails with `clang-16` due to operator ambiguity errors.
1 parent 40aa020 commit 7f7ea68

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

integration_test/Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ RUN python3.9 -m pip install pycapnp psutil pybind11==2.9.1 numpy jinja2 cocotb
1919

2020
RUN apt-get update && apt-get install -y tcl
2121

22-
# Install latest release of LLVM
22+
# Install a more recent release of LLVM
2323
RUN wget https://apt.llvm.org/llvm.sh; \
2424
chmod +x llvm.sh; \
25-
./llvm.sh 16;\
26-
apt install -y clang-format-16 clang-tidy-16
27-
28-
RUN ln -s /usr/bin/clang-16 /usr/bin/clang;\
29-
ln -s /usr/bin/clang++-16 /usr/bin/clang++;\
30-
ln -s /usr/bin/clang-tidy-16 /usr/bin/clang-tidy;\
31-
ln -s /usr/bin/clang-tidy-diff-16.py /usr/bin/clang-tidy-diff;\
32-
ln -s /usr/bin/clang-format-16 /usr/bin/clang-format;\
33-
ln -s /usr/bin/clang-format-diff-16 /usr/bin/clang-format-diff;\
34-
ln -s /usr/bin/git-clang-format-16 /usr/bin/git-clang-format;\
35-
ln -s /usr/bin/lld-16 /usr/bin/lld;\
36-
ln -s /usr/bin/lld-16 /usr/bin/ld.lld
25+
./llvm.sh 17;\
26+
apt install -y clang-format-17 clang-tidy-17
27+
28+
RUN ln -s /usr/bin/clang-17 /usr/bin/clang; \
29+
ln -s /usr/bin/clang++-17 /usr/bin/clang++; \
30+
ln -s /usr/bin/clang-tidy-17 /usr/bin/clang-tidy; \
31+
ln -s /usr/bin/clang-tidy-diff-17.py /usr/bin/clang-tidy-diff; \
32+
ln -s /usr/bin/clang-format-17 /usr/bin/clang-format; \
33+
ln -s /usr/bin/clang-format-diff-17 /usr/bin/clang-format-diff; \
34+
ln -s /usr/bin/git-clang-format-17 /usr/bin/git-clang-format; \
35+
ln -s /usr/bin/lld-17 /usr/bin/lld; \
36+
ln -s /usr/bin/lld-17 /usr/bin/ld.lld
3737

3838
# Install GCC 11 to get C++20 header support and support for building slang
3939
RUN add-apt-repository ppa:ubuntu-toolchain-r/test

0 commit comments

Comments
 (0)