From 4cc837335c564e96c53bb290f673604a25c56a11 Mon Sep 17 00:00:00 2001 From: Tomas Pecka <peckato1@fit.cvut.cz> Date: Sat, 4 Apr 2020 11:47:53 +0200 Subject: [PATCH] [alt-builder] Fix #2 --- alt-builder/Dockerfile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/alt-builder/Dockerfile b/alt-builder/Dockerfile index 8a08168..332e9d6 100644 --- a/alt-builder/Dockerfile +++ b/alt-builder/Dockerfile @@ -1,10 +1,10 @@ FROM amd64/debian:bullseye RUN apt-get update && apt-get install -y wget gnupg && \ - echo "deb http://apt.llvm.org/unstable/ llvm-toolchain-10 main" >> /etc/apt/sources.list && \ - echo "deb-src http://apt.llvm.org/unstable/ llvm-toolchain-10 main" >> /etc/apt/sources.list && \ - wget -O llvm.key "https://apt.llvm.org/llvm-snapshot.gpg.key" && apt-key add llvm.key && \ - apt-get remove --purge -y wget gnupg && \ + #echo "deb http://apt.llvm.org/unstable/ llvm-toolchain-10 main" >> /etc/apt/sources.list && \ + #echo "deb-src http://apt.llvm.org/unstable/ llvm-toolchain-10 main" >> /etc/apt/sources.list && \ + #wget -O llvm.key "https://apt.llvm.org/llvm-snapshot.gpg.key" && apt-key add llvm.key && \ + #apt-get remove --purge -y wget gnupg && \ \ apt-get update && \ apt-get install -y g++ g++-10 clang++-10 lld-10 \ @@ -16,7 +16,5 @@ RUN apt-get update && apt-get install -y wget gnupg && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ \ - ln -sf /usr/bin/g++-10 g++ && \ - ln -sf /usr/bin/gcc-10 gcc && \ - \ - for file in /usr/bin/*-10; do ln -sf $file $(echo $file | sed 's/-10$//g'); done + ln -sf /usr/bin/g++-10 g++ && ln -sf /usr/bin/gcc-10 gcc + #for file in /usr/bin/*-10; do ln -sf $file $(echo $file | sed 's/-10$//g'); done -- GitLab