Migrate clang/llvm to build images

Signed-off-by: Mike Beaton <[email protected]>
tianocore · Oct 2, 2024 · e3c8b06 · e3c8b06
1 parent 61000ca
commit e3c8b06
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Fedora-40/Dockerfile b/Fedora-40/Dockerfile
@@ -44,6 +44,7 @@ RUN dnf \
       install \
         acpica-tools \
         dotnet-runtime-${DOTNET_VERSION} \
+        clang \
         curl \
         gcc-c++ \
         gcc \
@@ -56,6 +57,8 @@ RUN dnf \
         libX11-devel \
         libXext-devel \
         libuuid-devel \
+        lld \
+        llvm \
         make \
         nuget \
         nasm \
@@ -110,10 +113,7 @@ RUN dnf \
       --setopt=install_weak_deps=0 \
       install \
         libicu \
-        clang \
         curl \
-        lld \
-        llvm \
         tar \
         vim \
         nano

diff --git a/Ubuntu-22/Dockerfile b/Ubuntu-22/Dockerfile
@@ -66,6 +66,10 @@ RUN apt-get update && \
         g++-${GCC_MAJOR_VERSION}-riscv64-linux-gnu gcc-${GCC_MAJOR_VERSION}-riscv64-linux-gnu \
         g++-${GCC_MAJOR_VERSION}-arm-linux-gnueabi gcc-${GCC_MAJOR_VERSION}-arm-linux-gnueabi \
         g++-${GCC_MAJOR_VERSION}-arm-linux-gnueabihf gcc-${GCC_MAJOR_VERSION}-arm-linux-gnueabihf && \
+    apt-get install --yes --no-install-recommends \
+        clang \
+        lld \
+        llvm && \
     apt-get upgrade -y && \
     apt-get clean &&\
     rm -rf /var/lib/apt/lists/*
@@ -175,10 +179,7 @@ FROM test AS dev
 RUN apt-get update && \
     apt-get install --yes --no-install-recommends \
         bear \
-        clang \
         less \
-        lld \
-        llvm \
         nano \
         vim \
         && \