From a1b2a1e4889eb59e064f95a248b22bd67a2817fd Mon Sep 17 00:00:00 2001 From: Luke Hutton Date: Thu, 21 Sep 2023 09:35:45 +0000 Subject: [PATCH] [Docker] Add LLVM 17 to the LLVM install script This commit ensures LLVM 17 is installed alongisde other version in the `ubuntu2204_install_llvm.sh` script. It also removes versions 13 and 14 as they don't appear to be used - a general cleanup of the images that use this script. Change-Id: I076a6feb92c253e68626ac55b6d39e3ed3c9c926 --- docker/install/ubuntu2204_install_llvm.sh | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/docker/install/ubuntu2204_install_llvm.sh b/docker/install/ubuntu2204_install_llvm.sh index eac8e6d7f16a..fa73ec6fbb63 100644 --- a/docker/install/ubuntu2204_install_llvm.sh +++ b/docker/install/ubuntu2204_install_llvm.sh @@ -20,16 +20,6 @@ set -e set -u set -o pipefail -echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-13 main\ - >> /etc/apt/sources.list.d/llvm.list -echo deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-13 main\ - >> /etc/apt/sources.list.d/llvm.list - -echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main\ - >> /etc/apt/sources.list.d/llvm.list -echo deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main\ - >> /etc/apt/sources.list.d/llvm.list - echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main\ >> /etc/apt/sources.list.d/llvm.list echo deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main\ @@ -40,6 +30,11 @@ echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main\ echo deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main\ >> /etc/apt/sources.list.d/llvm.list +echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main\ + >> /etc/apt/sources.list.d/llvm.list +echo deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main\ + >> /etc/apt/sources.list.d/llvm.list + echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main\ >> /etc/apt/sources.list.d/llvm.list echo deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy main\ @@ -47,8 +42,7 @@ echo deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy main\ wget -q -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - apt-get update && apt-install-and-clear -y \ - llvm-13 llvm-14 llvm-15 llvm-16 \ - clang-13 libclang-13-dev \ - clang-14 libclang-14-dev \ + llvm-15 llvm-16 llvm-17\ clang-15 libclang-15-dev \ - clang-16 libclang-16-dev libpolly-16-dev + clang-16 libclang-16-dev libpolly-16-dev \ + clang-17 libclang-17-dev libpolly-17-dev libzstd-dev