From ce5b4247960673432441a3ee60ee524018a4d26e Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Sat, 20 Jul 2024 15:44:13 +0300
Subject: [PATCH 1/3] Update llvm.sh arguments

---
 src/ubuntu/22.04/crossdeps/Dockerfile | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/ubuntu/22.04/crossdeps/Dockerfile b/src/ubuntu/22.04/crossdeps/Dockerfile
index d7ce94c8f..44653e3c2 100644
--- a/src/ubuntu/22.04/crossdeps/Dockerfile
+++ b/src/ubuntu/22.04/crossdeps/Dockerfile
@@ -40,12 +40,5 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # install llvm-toolchain using official script
-RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 18 \
-        clang \
-        clang-tools \
-        liblldb-dev \
-        lld \
-        lldb \
-        llvm \
-        python3-lldb \
+RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 18 all
     && rm -rf /var/lib/apt/lists/*

From 92c49695c100b3fa0171be8b3ca458f696093da4 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Sat, 20 Jul 2024 17:50:56 +0300
Subject: [PATCH 2/3] .

---
 src/ubuntu/22.04/crossdeps/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ubuntu/22.04/crossdeps/Dockerfile b/src/ubuntu/22.04/crossdeps/Dockerfile
index 44653e3c2..8f5e4761c 100644
--- a/src/ubuntu/22.04/crossdeps/Dockerfile
+++ b/src/ubuntu/22.04/crossdeps/Dockerfile
@@ -40,5 +40,5 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # install llvm-toolchain using official script
-RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 18 all
+RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 18 all \
     && rm -rf /var/lib/apt/lists/*

From b6c5c34f644e55d01f25250d0dc9605c0397f8e2 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Mon, 22 Jul 2024 12:51:43 +0300
Subject: [PATCH 3/3] Update src/ubuntu/22.04/crossdeps/Dockerfile

---
 src/ubuntu/22.04/crossdeps/Dockerfile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ubuntu/22.04/crossdeps/Dockerfile b/src/ubuntu/22.04/crossdeps/Dockerfile
index 8f5e4761c..762a22978 100644
--- a/src/ubuntu/22.04/crossdeps/Dockerfile
+++ b/src/ubuntu/22.04/crossdeps/Dockerfile
@@ -40,5 +40,9 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # install llvm-toolchain using official script
-RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 18 all \
+RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 18 \
+    && apt-get install -y \
+        clang-tools-18 \
+        liblldb-18-dev \
+        llvm-18 \
     && rm -rf /var/lib/apt/lists/*