Skip to content

Commit 0b50c5b

Browse files
authored
Merge pull request #37 from Navigraph/fix-dockerfile
Pull LLVM toolchain from Debian registry
2 parents efa10bb + 571e163 commit 0b50c5b

1 file changed

Lines changed: 27 additions & 11 deletions

File tree

Dockerfile

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,33 @@
11
FROM rust:1.90
22

3-
# Install needed packages and clean up
4-
RUN apt update && \
5-
apt install -y --no-install-recommends lsb-release wget gnupg gcc-multilib git && \
6-
rm -rf /var/lib/apt/lists/*
7-
8-
# Install clang and clean up
9-
RUN wget https://apt.llvm.org/llvm.sh && \
10-
chmod +x llvm.sh && \
11-
./llvm.sh 17 && \
3+
# Install base needed packages
4+
RUN apt-get update && \
5+
apt-get install -y --no-install-recommends lsb-release wget gnupg gcc-multilib git
6+
7+
# Install llvm-toolchain-17
8+
RUN apt-get install -y --no-install-recommends \
9+
clang-17 \
10+
clangd-17 \
11+
clang-format-17 \
12+
clang-tidy-17 \
13+
clang-tools-17 \
14+
llvm-17-dev \
15+
llvm-17-tools \
16+
lld-17 \
17+
lldb-17 \
18+
liblldb-17-dev \
19+
libomp-17-dev \
20+
libc++-17-dev \
21+
libc++abi-17-dev \
22+
libunwind-17-dev \
23+
libclang-common-17-dev \
24+
libclang-17-dev \
25+
libclang-cpp17-dev && \
1226
ln -s $(which clang-17) /usr/bin/clang && \
13-
ln -s $(which llvm-ar-17) /usr/bin/llvm-ar && \
14-
rm llvm.sh
27+
ln -s $(which llvm-ar-17) /usr/bin/llvm-ar
28+
29+
# Remove apt index
30+
RUN rm -rf /var/lib/apt/lists/*
1531

1632
# Install rust target
1733
RUN rustup target install wasm32-wasip1

0 commit comments

Comments
 (0)