From 206302003fc620316acb67b026be9e43eb754df7 Mon Sep 17 00:00:00 2001
From: "Yu-Hang \"Maxin\" Tang" <Tang.Maxin@gmail.com>
Date: Thu, 29 Feb 2024 23:33:23 -0800
Subject: [PATCH] Install latest llvm/clang using script from
 https://apt.llvm.org/ (#600)

---
 .github/container/Dockerfile.base | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/container/Dockerfile.base b/.github/container/Dockerfile.base
index fdc0c45e7..b41fb1cf5 100644
--- a/.github/container/Dockerfile.base
+++ b/.github/container/Dockerfile.base
@@ -4,14 +4,14 @@ ARG GIT_USER_NAME="JAX Toolbox"
 ARG GIT_USER_EMAIL=jax@nvidia.com
 ARG SRC_MANIFEST_FILE=manifest.yaml
 ARG DEST_MANIFEST_DIR=/opt/manifest.d
-
+ARG CLANG_VERSION=17
 
 FROM ${BASE_IMAGE}
 ARG GIT_USER_EMAIL
 ARG GIT_USER_NAME
 ARG SRC_MANIFEST_FILE
 ARG DEST_MANIFEST_DIR
-
+ARG CLANG_VERSION
 
 ###############################################################################
 ## Install Python and essential tools
@@ -26,7 +26,6 @@ apt-get install -y \
   bat \
   build-essential \
   checkinstall \
-  clang \
   cmake \
   curl \
   git \
@@ -37,7 +36,14 @@ apt-get install -y \
   python3-pip \
   rsync \
   vim \
-  wget
+  wget \
+  lsb-release software-properties-common  # for llvm.sh
+
+# Install LLVM/Clang
+bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" -- ${CLANG_VERSION}
+apt-get remove -y software-properties-common lsb-release
+apt-get autoremove -y  # removes python3-blinker which conflicts with pip-compile in JAX
+
 apt-get clean
 rm -rf /var/lib/apt/lists/*
 EOF