From 648d99e7dd21b0ac77637e99c9a3b9e52b53e9aa Mon Sep 17 00:00:00 2001 From: Nikolas Klauser Date: Wed, 3 Aug 2022 19:35:34 +0200 Subject: [PATCH] [libc++] Install clang-tools in the CI container This is required for using clang-query in the CI Reviewed By: Mordante, #libc Spies: libcxx-commits, arichardson Differential Revision: https://reviews.llvm.org/D130845 --- libcxx/utils/ci/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile index f175b70..a460ed1 100644 --- a/libcxx/utils/ci/Dockerfile +++ b/libcxx/utils/ci/Dockerfile @@ -72,14 +72,18 @@ RUN ln -fs /usr/bin/clang++-$LLVM_LATEST_VERSION /usr/bin/c++ && [ -e $(readlink RUN ln -fs /usr/bin/clang-$LLVM_LATEST_VERSION /usr/bin/cc && [ -e $(readlink /usr/bin/cc) ] # Install clang-format -RUN apt-get install -y clang-format-$LLVM_LATEST_VERSION +RUN apt-get update && apt-get install -y clang-format-$LLVM_LATEST_VERSION RUN ln -s /usr/bin/clang-format-$LLVM_LATEST_VERSION /usr/bin/clang-format && [ -e $(readlink /usr/bin/clang-format) ] RUN ln -s /usr/bin/git-clang-format-$LLVM_LATEST_VERSION /usr/bin/git-clang-format && [ -e $(readlink /usr/bin/git-clang-format) ] # Install clang-tidy -RUN apt-get install -y clang-tidy-$LLVM_LATEST_VERSION +RUN apt-get update && apt-get install -y clang-tidy-$LLVM_LATEST_VERSION RUN ln -s /usr/bin/clang-tidy-$LLVM_LATEST_VERSION /usr/bin/clang-tidy && [ -e $(readlink /usr/bin/clang-tidy) ] +# Install clang-tools +RUN apt-get update && apt-get install -y clang-tools-$LLVM_LATEST_VERSION +RUN ln -s /usr/bin/clang-query-$LLVM_LATEST_VERSION /usr/bin/clang-query && [ -e $(readlink /usr/bin/clang-query) ] + # Install the most recent GCC, like clang install the previous version as a transition. ENV GCC_LATEST_VERSION=12 RUN apt-get update && apt install -y gcc-$((GCC_LATEST_VERSION - 1)) g++-$((GCC_LATEST_VERSION - 1)) -- 2.7.4