File tree Expand file tree Collapse file tree 4 files changed +0
-34
lines changed
Expand file tree Collapse file tree 4 files changed +0
-34
lines changed Original file line number Diff line number Diff line change @@ -155,21 +155,6 @@ FROM base AS clang
155155# This is not inherited from base image, ensure no manual interaction needed.
156156ARG DEBIAN_FRONTEND=noninteractive
157157
158- # Some build dependencies require GCC to be available.
159- COPY --from=gcc-src /usr/local/ /usr/local/
160- COPY --from=gcc-src /etc/ld.so.conf.d/*.conf /etc/ld.so.conf.d/
161- RUN <<EOF
162- ldconfig -v
163- dpkg-divert --divert /usr/bin/gcc.orig --rename /usr/bin/gcc
164- update-alternatives --install /usr/bin/gcc gcc /usr/local/bin/gcc 100
165- update-alternatives --install \
166- /usr/bin/gcc gcc /usr/local/bin/gcc 100 \
167- --slave /usr/bin/g++ g++ /usr/local/bin/g++ \
168- --slave /usr/bin/gcc-ar gcc-ar /usr/local/bin/gcc-ar \
169- --slave /usr/bin/gcc-nm gcc-nm /usr/local/bin/gcc-nm \
170- --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/local/bin/gcc-ranlib
171- EOF
172-
173158# Install Clang. Use the LLVM apt repository to access the latest versions. We
174159# must repeat the DEBIAN_VERSION argument here, as it is not inherited from the
175160# base or source images.
Original file line number Diff line number Diff line change @@ -70,7 +70,6 @@ registry.
7070DEBIAN_VERSION=bookworm
7171CLANG_VERSION=17
7272CONAN_VERSION=2.18.0
73- GCC_VERSION=12
7473GCOVR_VERSION=8.3
7574CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION} :clang-${CLANG_VERSION}
7675
@@ -82,7 +81,6 @@ docker buildx build . \
8281 --build-arg CLANG_VERSION=${CLANG_VERSION} \
8382 --build-arg CONAN_VERSION=${CONAN_VERSION} \
8483 --build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
85- --build-arg GCC_VERSION=${GCC_VERSION} \
8684 --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
8785 --tag ${CONTAINER_REGISTRY} /${CONTAINER_IMAGE}
8886```
Original file line number Diff line number Diff line change @@ -139,21 +139,6 @@ FROM base AS clang
139139# This is not inherited from base image, ensure no manual interaction needed.
140140ARG DEBIAN_FRONTEND=noninteractive
141141
142- # Some build dependencies require GCC to be available.
143- ARG GCC_VERSION
144- RUN <<EOF
145- apt-get update
146- apt-get install -y --no-install-recommends \
147- gcc-${GCC_VERSION} \
148- g++-${GCC_VERSION} \
149- debhelper
150- apt-get clean
151- rm -rf /var/lib/apt/lists/*
152- update-alternatives \
153- --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 100 \
154- --slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION}
155- EOF
156-
157142# Install Clang.
158143ARG CLANG_VERSION
159144RUN <<EOF
Original file line number Diff line number Diff line change @@ -66,7 +66,6 @@ registry.
6666UBUNTU_VERSION=noble
6767CLANG_VERSION=18
6868CONAN_VERSION=2.18.0
69- GCC_VERSION=14
7069GCOVR_VERSION=8.3
7170CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION} :clang-${CLANG_VERSION}
7271
@@ -77,7 +76,6 @@ docker buildx build . \
7776 --build-arg BUILDKIT_INLINE_CACHE=1 \
7877 --build-arg CLANG_VERSION=${CLANG_VERSION} \
7978 --build-arg CONAN_VERSION=${CONAN_VERSION} \
80- --build-arg GCC_VERSION=${GCC_VERSION} \
8179 --build-arg GCOVR_VERSION=${GCOVR_VERSION} \
8280 --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
8381 --tag ${CONTAINER_REGISTRY} /${CONTAINER_IMAGE}
You can’t perform that action at this time.
0 commit comments