@@ -49,33 +49,31 @@ RUN set -ex; \
49
49
g++ \
50
50
gettext \
51
51
git \
52
- gnupg \
53
52
libtool \
54
- lsb-release \
55
- software-properties-common \
56
53
unzip \
57
- wget \
58
54
m4 \
59
55
pkg-config \
60
56
zlib1g-dev \
61
57
&& rm -rf /var/lib/apt/lists/*
62
58
63
59
# Install Clang+LLVM and set it as default
64
- # We don't need all packages but the default set doesn't include some
65
- # packages we want so we will need to install some of them manually.
66
60
ARG LLVM_VERSION=18
67
61
RUN set -ex; \
68
62
echo "Installing LLVM and Clang ${LLVM_VERSION}..." ; \
69
- curl -sL https://apt.llvm.org/llvm.sh | bash -s -- "${LLVM_VERSION}" ; \
70
- echo "Installing additional packages..." ; \
71
- apt-get update && apt-get install $APT_ARGS \
63
+ . /etc/os-release; \
64
+ curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key > /etc/apt/trusted.gpg.d/apt.llvm.org.asc; \
65
+ echo "deb [signed-by=/etc/apt/trusted.gpg.d/apt.llvm.org.asc] http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-${LLVM_VERSION} main" > /etc/apt/sources.list.d/llvm.list; \
66
+ apt-get update && apt-get install ${APT_ARGS} \
67
+ "clang-${LLVM_VERSION}" \
68
+ "clangd-${LLVM_VERSION}" \
72
69
"clang-format-${LLVM_VERSION}" \
73
70
"clang-tidy-${LLVM_VERSION}" \
74
71
"libc++-${LLVM_VERSION}-dev" \
75
72
"libc++abi-${LLVM_VERSION}-dev" \
76
73
"libclang-${LLVM_VERSION}-dev" \
77
74
"libclang-rt-${LLVM_VERSION}-dev" \
78
75
"lld-${LLVM_VERSION}" \
76
+ "lldb-${LLVM_VERSION}" \
79
77
"llvm-${LLVM_VERSION}-dev" ; \
80
78
rm -rf /var/lib/apt/lists/*; \
81
79
echo "Setting defaults..." ; \
0 commit comments