From 118bf64d9182938fafbd645e759244829a28517a Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman@google.com>
Date: Sat, 15 Nov 2025 18:44:35 +0000
Subject: [PATCH] [libxx] Install ninja in CI container from system repo

To fix the TODO now that the ninja version available in the Ubuntu
repositories (1.11) is new enough.
---
 libcxx/utils/ci/docker/linux-builder-base.dockerfile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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