Skip to content

Commit baf0d81

Browse files
committed
base: Update ccache to 4.13.2
This commit updates the ccache version from 4.9.1 to 4.13.2. It also modifies the Dockerfile to install ccache on AArch64 since ccache now provides pre-built binaries for it. Signed-off-by: Stephanos Ioannidis <root@stephanos.io>
1 parent fec89e3 commit baf0d81

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

Dockerfile.base

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ARG UBUNTU_MIRROR_PORTS=ports.ubuntu.com/ubuntu-ports
1515

1616
ARG KITWARE_NINJA_VERSION=1.11.1.g95dee.kitware.jobserver-1
1717
ENV KITWARE_NINJA_VERSION=$KITWARE_NINJA_VERSION
18-
ARG CCACHE_VERSION=4.9.1
18+
ARG CCACHE_VERSION=4.13.2
1919
ENV CCACHE_VERSION=$CCACHE_VERSION
2020
ARG DOXYGEN_VERSION=1.16.1
2121
ENV DOXYGEN_VERSION=$DOXYGEN_VERSION
@@ -78,7 +78,6 @@ RUN <<EOF
7878
bison \
7979
build-essential \
8080
ca-certificates \
81-
ccache \
8281
chrpath \
8382
cmake \
8483
cpio \
@@ -258,14 +257,12 @@ RUN <<EOF
258257
EOF
259258

260259
# Install ccache
261-
# NOTE: Pre-built ccache binaries are only available for x86_64 host.
262260
RUN <<EOF
263-
if [ "${HOSTTYPE}" = "x86_64" ]; then
264-
wget ${WGET_ARGS} https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}-linux-x86_64.tar.xz
265-
tar xf ccache-${CCACHE_VERSION}-linux-x86_64.tar.xz -C /opt
266-
ln -s /opt/ccache-${CCACHE_VERSION}-linux-x86_64/ccache /usr/local/bin
267-
rm ccache-${CCACHE_VERSION}-linux-x86_64.tar.xz
268-
fi
261+
CCACHE_BASENAME=ccache-${CCACHE_VERSION}-linux-${HOSTTYPE}-glibc
262+
wget ${WGET_ARGS} https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/${CCACHE_BASENAME}.tar.xz
263+
tar xf ${CCACHE_BASENAME}.tar.xz -C /opt
264+
ln -s /opt/${CCACHE_BASENAME}/ccache /usr/local/bin
265+
rm ${CCACHE_BASENAME}.tar.xz
269266
EOF
270267

271268
# Install Doxygen (x86 only)

0 commit comments

Comments
 (0)