Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5374f16

Browse files
[libcxx][ci][NFC] Remove commented install line and disutils reference (#158015)
76667c7 added distutils because "spawn" was used, which I then removed in 268a4b0. 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.
1 parent 7982980 commit 5374f16

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

libcxx/utils/ci/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ RUN sudo apt-get update \
7676
&& sudo apt-get install -y \
7777
tzdata
7878

79+
# Install various tools used by the build or the test suite
80+
# TODO add ninja-build once 1.11 is available in Ubuntu, also remove the manual
81+
# installation below.
7982
RUN sudo apt-get update \
8083
&& sudo apt-get install -y \
8184
bash \
@@ -108,9 +111,6 @@ RUN sudo apt-get update \
108111
xz-utils \
109112
&& sudo rm -rf /var/lib/apt/lists/*
110113

111-
# Install various tools used by the build or the test suite
112-
#RUN apt-get update && apt-get install -y ninja-build python3 python3-distutils python3-psutil git gdb ccache
113-
# TODO add ninja-build once 1.11 is available in Ubuntu, also remove the manual installation.
114114
RUN <<EOF
115115
set -e
116116
wget -qO /tmp/ninja.gz https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip

0 commit comments

Comments
 (0)