Skip to content

Commit 4306cad

Browse files
committed
Docker.system-clang: Update the system-clang testcase to Ubuntu 24.04
Update to using clang-18 from the host system; version 16 or newer is required for the implicitly selected config files (which are used since 866d47c); that version changed whether the target triples are normalized before locating config files. This allows building runtimes with the current versions of LLVM 19.x, rather than needing to select an older version.
1 parent 1f99e3e commit 4306cad

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Dockerfile.system-clang

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
RUN apt-get update -qq && \
44
DEBIAN_FRONTEND="noninteractive" apt-get install -qqy --no-install-recommends \
@@ -10,7 +10,7 @@ RUN apt-get update -qq && \
1010

1111
# Separate step for system-clang; the RUN line above is similar to other dockerfiles.
1212
RUN apt-get update -qq && \
13-
apt-get install -qqy clang-15 lld-15 llvm-15 && \
13+
apt-get install -qqy clang-18 lld-18 llvm-18 && \
1414
apt-get clean -y && \
1515
rm -rf /var/lib/apt/lists/*
1616

@@ -33,8 +33,7 @@ ARG CFGUARD_ARGS=--enable-cfguard
3333

3434
COPY build-all.sh build-llvm.sh install-wrappers.sh build-mingw-w64.sh build-mingw-w64-tools.sh build-compiler-rt.sh build-libcxx.sh build-mingw-w64-libraries.sh build-openmp.sh ./
3535
COPY wrappers/*.sh wrappers/*.c wrappers/*.h wrappers/*.cfg ./wrappers/
36-
# Libcxx version 17 requires Clang >= 15, while Libcxx 18 requires Clang >= 16.
37-
RUN LLVM_VERSION=llvmorg-17.0.6 ./build-all.sh $TOOLCHAIN_PREFIX --host-clang=clang-15 && \
36+
RUN ./build-all.sh $TOOLCHAIN_PREFIX --host-clang=clang-18 && \
3837
rm -rf /build/*
3938

4039
ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH

0 commit comments

Comments
 (0)