From 4c38b871c8781e3eb0171cd99aaeb513490accc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Tue, 12 Nov 2024 11:04:46 +0100 Subject: [PATCH] Update clang-asan R build to use clang 19 --- builder/Dockerfile.ubuntu-2204-asan | 8 ++++---- builder/config.ubuntu-2204-asan | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/builder/Dockerfile.ubuntu-2204-asan b/builder/Dockerfile.ubuntu-2204-asan index 0569ba9f..6325bf4d 100644 --- a/builder/Dockerfile.ubuntu-2204-asan +++ b/builder/Dockerfile.ubuntu-2204-asan @@ -26,18 +26,18 @@ RUN apt-get update && \ apt-get build-dep -y r-base # ------------------------------------------------------------------------- -# clang-18 +# clang-19 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update -y && \ apt-get install -y gnupg && \ - echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" \ + echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main" \ > /etc/apt/sources.list.d/llvm.list && \ - echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" \ + echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main" \ >> /etc/apt/sources.list.d/llvm.list && \ curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ apt-get update -y && \ - apt-get install -y clang-18 libc++abi-18-dev libc++-18-dev libomp-18-dev flang-18 && \ + apt-get install -y clang-19 libc++abi-19-dev libc++-19-dev libomp-19-dev flang-19 && \ apt-get clean # ------------------------------------------------------------------------- diff --git a/builder/config.ubuntu-2204-asan b/builder/config.ubuntu-2204-asan index d402a919..a0e1a280 100644 --- a/builder/config.ubuntu-2204-asan +++ b/builder/config.ubuntu-2204-asan @@ -1,11 +1,11 @@ -CC="clang-18" -CXX="clang++-18 -stdlib=libc++" -FC="flang-new-18" +CC="clang-19" +CXX="clang++-19 -stdlib=libc++" +FC="flang-new-19" CFLAGS="-g -O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3" CXXFLAGS="-g -O3 -Wall -pedantic -Wp,-D_FORTIFY_SOURCE=3" FFLAGS="-O2 -pedantic" -MAIN_LD="clang++-18 -stdlib=libc++ -fsanitize=undefined,address" +MAIN_LD="clang++-19 -stdlib=libc++ -fsanitize=undefined,address" R_LD_LIBRARY_PATH="/usr/local/clang/lib:/usr/local/lib:/usr/lib/x86_64-linux-gnu" CPPFLAGS="-I/usr/local/clang/include -I/usr/local/include" LDFLAGS="-L/usr/local/clang/lib -L/usr/local/lib"