debian-build: install llvm from deb repos

Author: pgils

debian-build/Containerfile

@@ -12,6 +12,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN set -eu; \
     apt-get update -q; \
     apt-get install -qy --no-install-recommends \
+        clang-"${LLVM_VERSION}*" \
+        lld-"${LLVM_VERSION}*" \
         bison \
         cmake \
         flex \
@@ -34,6 +36,8 @@ RUN set -eu; \
         quilt \
     ; \
     rm -rf /var/lib/apt/lists/*; \
+    update-alternatives --install /usr/local/bin/clang clang /usr/bin/clang-${LLVM_VERSION} 100 ; \
+    update-alternatives --install /usr/local/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 100 ; \
     echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 ENV LANG=en_US.UTF-8
 ENV EDITOR=vim.tiny
@@ -56,20 +60,6 @@ RUN set -eu; \
         | tar -xzf- --strip 1
 ENV PATH=/bitbake/bin:$PATH
 
-## LLVM
-# https://apt.llvm.org/
-
-RUN set -eu; \
-    wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key|tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc ; \
-    echo "deb http://apt.llvm.org/${DEBIAN_VERSION}/ llvm-toolchain-${DEBIAN_VERSION}-${LLVM_VERSION} main" \
-        > /etc/apt/sources.list.d/llvm.list ; \
-    apt-get update -q && apt-get install -qy --no-install-recommends \
-        clang-"${LLVM_VERSION}*" \
-        lld-"${LLVM_VERSION}*" \
-    ; \
-    update-alternatives --install /usr/local/bin/clang clang /usr/bin/clang-${LLVM_VERSION} 100 ; \
-    update-alternatives --install /usr/local/bin/clang++ clang++ /usr/bin/clang++-${LLVM_VERSION} 100 ;
-
 ## UPX
 # https://upx.github.io/