Skip to content

Commit 585e01d

Browse files
committed
base: Switch to distro-provided LLVM/Clang packages
The LLVM APT repository does not provide i386 packages and this leads to package version conflicts when an i386 package pulls the `libllvm` package as a dependency (refer to the issue #269 for more details). Since Ubuntu 24.04 provides the LLVM/Clang 20 packages, use those to avoid package version conflicts. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
1 parent 5f219dd commit 585e01d

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Dockerfile.base

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,16 @@ RUN <<EOF
158158
fi
159159

160160
# Install LLVM and Clang
161-
wget ${WGET_ARGS} https://apt.llvm.org/llvm.sh
162-
chmod +x llvm.sh
163-
./llvm.sh ${LLVM_VERSION} all
164-
rm -f llvm.sh
161+
apt-get install --no-install-recommends -y \
162+
clang-${LLVM_VERSION} \
163+
clang-format-${LLVM_VERSION} \
164+
clang-tidy-${LLVM_VERSION} \
165+
clang-tools-${LLVM_VERSION} \
166+
clangd-${LLVM_VERSION} \
167+
libc++-${LLVM_VERSION}-dev \
168+
lld-${LLVM_VERSION} \
169+
lldb-${LLVM_VERSION} \
170+
llvm-${LLVM_VERSION}
165171

166172
# Install Python 3.9 for FVP
167173
add-apt-repository -y ppa:deadsnakes/ppa

0 commit comments

Comments
 (0)