[llvm] [GIthub] symlink `llvm-tools` in libc container (PR #210561)

[via llvm-commits]

https://github.com/hulxv updated https://github.com/llvm/llvm-project/pull/210561

>From be4f26b5cafae238bfb14bdf8ff87ecce2517980 Mon Sep 17 00:00:00 2001
From: hulxv <hulxxv at gmail.com>
Date: Sun, 19 Jul 2026 03:23:56 +0300
Subject: [PATCH 1/2] [GIthub] symlink `llvm-tools` in libc container

---
 .github/workflows/containers/libc/Dockerfile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/containers/libc/Dockerfile b/.github/workflows/containers/libc/Dockerfile
index b497dc7159b5d..1134a46d45a7f 100644
--- a/.github/workflows/containers/libc/Dockerfile
+++ b/.github/workflows/containers/libc/Dockerfile
@@ -45,11 +45,14 @@ RUN wget https://apt.llvm.org/llvm.sh && \
     sudo ./llvm.sh 23 && \
     rm llvm.sh
 
-# Install the LLVM testing tools, which the llvm.sh script above does not
-# include. This provides lit (as lit-23) along with FileCheck, not, count and
-# split-file, which are required to run the libc test suites and some CIs like
-# precommit testing CI for libc-based compiler-rt builtins. 
-RUN apt-get install -y llvm-23-tools
+# include. This provides lit along with FileCheck, not, count and split-file,
+# which are required to run the libc test suites and some CIs like precommit
+# testing CI for libc-based compiler-rt builtins. The package only symlinks
+# the tools into /usr/bin under versioned names (lit-23, FileCheck-23, ...),
+# so also symlink them under their canonical names.
+RUN apt-get install -y llvm-23-tools && \
+    ln -s -t /usr/bin $(dpkg -L llvm-23-tools | grep '^/usr/lib/llvm-23/bin/')
+
 
 # Install gmp and mpfr for cross compilation
 RUN wget https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz && \

>From fa126facc10598f20812e65ce02eb658a72dde32 Mon Sep 17 00:00:00 2001
From: hulxv <hulxxv at gmail.com>
Date: Sun, 19 Jul 2026 03:35:04 +0300
Subject: [PATCH 2/2] removed line by mistake

---
 .github/workflows/containers/libc/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/containers/libc/Dockerfile b/.github/workflows/containers/libc/Dockerfile
index 1134a46d45a7f..1367b89fab104 100644
--- a/.github/workflows/containers/libc/Dockerfile
+++ b/.github/workflows/containers/libc/Dockerfile
@@ -45,6 +45,7 @@ RUN wget https://apt.llvm.org/llvm.sh && \
     sudo ./llvm.sh 23 && \
     rm llvm.sh
 
+# Install the LLVM testing tools, which the llvm.sh script above does not
 # include. This provides lit along with FileCheck, not, count and split-file,
 # which are required to run the libc test suites and some CIs like precommit
 # testing CI for libc-based compiler-rt builtins. The package only symlinks