[libcxx-commits] [libcxx] [libcxx][ci][NFC] Remove commented install line and disutils reference (PR #158015)
David Spickett via libcxx-commits
libcxx-commits at lists.llvm.org
Thu Sep 11 01:52:14 PDT 2025
https://github.com/DavidSpickett created https://github.com/llvm/llvm-project/pull/158015
76667c768e6403e71718340a946e6f2f356bf745 added distutils because "spawn" was used, which I then removed in 268a4b0a451432833d3b398c7182d133c865dff5.
I removed it as part of removing all uses of distutils in llvm-project, tracked in #54337. Python has removed distutils in its latest versions.
Distutils was not being installed in the docker image but just mentioned in a commented out line. I think this line was leftover from when it was reformated into the multi-line command above.
So I'm removing the whole line and relocating the comments a bit.
>From 09d255fa3bd941b0f9b8e4aebf1a1f7842aa6331 Mon Sep 17 00:00:00 2001
From: David Spickett <david.spickett at linaro.org>
Date: Thu, 11 Sep 2025 08:48:11 +0000
Subject: [PATCH] [libcxx][ci][NFC] Remove commented install line and disutils
reference
76667c768e6403e71718340a946e6f2f356bf745 added distutils because
"spawn" was used, which I then removed in 268a4b0a451432833d3b398c7182d133c865dff5.
I removed it as part of removing all uses of distutils in llvm-project,
tracked in #54337. Python has removed distutils in its latest versions.
Distutils was not being installed in the docker image but just
mentioned in a commented out line. I think this line was leftover
from when it was reformated into the multi-line command above.
So I'm removing the whole line and relocating the comments
a bit.
---
libcxx/utils/ci/Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index 79e11569c0d08..8e1c341c10b92 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -76,6 +76,9 @@ RUN sudo apt-get update \
&& sudo apt-get install -y \
tzdata
+# Install various tools used by the build or the test suite
+# TODO add ninja-build once 1.11 is available in Ubuntu, also remove the manual
+# installation below.
RUN sudo apt-get update \
&& sudo apt-get install -y \
bash \
@@ -108,9 +111,6 @@ RUN sudo apt-get update \
xz-utils \
&& sudo rm -rf /var/lib/apt/lists/*
-# Install various tools used by the build or the test suite
-#RUN apt-get update && apt-get install -y ninja-build python3 python3-distutils python3-psutil git gdb ccache
-# TODO add ninja-build once 1.11 is available in Ubuntu, also remove the manual installation.
RUN <<EOF
set -e
wget -qO /tmp/ninja.gz https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip
More information about the libcxx-commits
mailing list