Skip to content

Commit

Permalink
Update clang to 17 in short integration test image (#33)
Browse files Browse the repository at this point in the history
Updating `slang` requires `C++20`. Compiling with `C++20` fails with `clang-16` due to operator ambiguity errors.
  • Loading branch information
hovind authored Nov 20, 2024
1 parent 40aa020 commit 7f7ea68
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions integration_test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ RUN python3.9 -m pip install pycapnp psutil pybind11==2.9.1 numpy jinja2 cocotb

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

# Install latest release of LLVM
# Install a more recent release of LLVM
RUN wget https://apt.llvm.org/llvm.sh; \
chmod +x llvm.sh; \
./llvm.sh 16;\
apt install -y clang-format-16 clang-tidy-16

RUN ln -s /usr/bin/clang-16 /usr/bin/clang;\
ln -s /usr/bin/clang++-16 /usr/bin/clang++;\
ln -s /usr/bin/clang-tidy-16 /usr/bin/clang-tidy;\
ln -s /usr/bin/clang-tidy-diff-16.py /usr/bin/clang-tidy-diff;\
ln -s /usr/bin/clang-format-16 /usr/bin/clang-format;\
ln -s /usr/bin/clang-format-diff-16 /usr/bin/clang-format-diff;\
ln -s /usr/bin/git-clang-format-16 /usr/bin/git-clang-format;\
ln -s /usr/bin/lld-16 /usr/bin/lld;\
ln -s /usr/bin/lld-16 /usr/bin/ld.lld
./llvm.sh 17;\
apt install -y clang-format-17 clang-tidy-17

RUN ln -s /usr/bin/clang-17 /usr/bin/clang; \
ln -s /usr/bin/clang++-17 /usr/bin/clang++; \
ln -s /usr/bin/clang-tidy-17 /usr/bin/clang-tidy; \
ln -s /usr/bin/clang-tidy-diff-17.py /usr/bin/clang-tidy-diff; \
ln -s /usr/bin/clang-format-17 /usr/bin/clang-format; \
ln -s /usr/bin/clang-format-diff-17 /usr/bin/clang-format-diff; \
ln -s /usr/bin/git-clang-format-17 /usr/bin/git-clang-format; \
ln -s /usr/bin/lld-17 /usr/bin/lld; \
ln -s /usr/bin/lld-17 /usr/bin/ld.lld

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

0 comments on commit 7f7ea68

Please sign in to comment.