[libcxx] Install ninja in CI container from system repo

[boomanaiden154]

To fix the TODO now that the ninja version available in the Ubuntu repositories (1.11) is new enough.

[llvmbot]

@llvm/pr-subscribers-libcxx

Author: Aiden Grossman (boomanaiden154)

Changes

To fix the TODO now that the ninja version available in the Ubuntu repositories (1.11) is new enough.

---

Full diff: https://github.com/llvm/llvm-project/pull/168225.diff

1 Files Affected:

• (modified) libcxx/utils/ci/docker/linux-builder-base.dockerfile (+1-8)

diff --git a/libcxx/utils/ci/docker/linux-builder-base.dockerfile b/libcxx/utils/ci/docker/linux-builder-base.dockerfile
index af09f15a72747..8a8a6e3888cbb 100644
--- a/libcxx/utils/ci/docker/linux-builder-base.dockerfile
+++ b/libcxx/utils/ci/docker/linux-builder-base.dockerfile
@@ -70,6 +70,7 @@ RUN sudo apt-get update \
         libxml2-dev \
         lsb-release \
         make \
+        ninja-build \
         python3 \
         python3-dev \
         python3-packaging \
@@ -83,14 +84,6 @@ RUN sudo apt-get update \
         xz-utils \
     && sudo rm -rf /var/lib/apt/lists/*
 
-RUN <<EOF
-  set -e
-  wget -qO /tmp/ninja.gz https://github.com/ninja-build/ninja/releases/latest/download/ninja-linux.zip
-  gunzip /tmp/ninja.gz
-  chmod a+x /tmp/ninja
-  sudo mv /tmp/ninja /usr/local/bin/ninja
-EOF
-
 # These two locales are not enabled by default so generate them
 RUN <<EOF
   set -e