Skip to content

Commit 6ff7267

Browse files
committed
Downgrade Docker image to LLVM-15
The LLVM-21 installation script works on the Docker image, but not on Gradescope. Unsure of the exact cause (both should be Ubuntu 22.04).
1 parent 1518741 commit 6ff7267

1 file changed

Lines changed: 18 additions & 17 deletions

File tree

Dockerfile

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,26 @@ RUN apt-get update && apt-get install -y \
3737

3838

3939
#------------------------------
40-
# Install LLVM version 21
40+
# Install LLVM version 15
4141
#
42-
# LLVM version 21 isn't available by default in Ubuntu 22.04's apt repos
42+
# The LLVM-21 installation script works on the Docker image but not on Gradescope (even
43+
# though both should be Ubuntu 22.04). Not sure about the exact reason, maybe Chris
44+
# Lattner hates the educational mission and wants to stop us.
4345
#------------------------------
44-
RUN wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh \
45-
&& ./llvm.sh 21 && rm llvm.sh \
46-
&& apt-get update && apt-get install -y \
47-
clang-21 \
48-
lldb-21 \
49-
lld-21 \
50-
llvm-21 \
51-
llvm-21-dev \
52-
&& update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-21 100 \
53-
&& update-alternatives --install /usr/bin/llc llc /usr/bin/llc-21 100 \
54-
&& update-alternatives --install /usr/bin/opt opt /usr/bin/opt-21 100 \
55-
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-21 100 \
56-
&& update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-21 100 \
57-
&& update-alternatives --install /usr/bin/lld lld /usr/bin/lld-21 100 \
58-
&& update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-21 100
46+
47+
RUN apt-get update && apt-get install -y \
48+
clang-15 \
49+
lldb-15 \
50+
lld-15 \
51+
llvm-15 \
52+
llvm-15-dev \
53+
&& update-alternatives --install /usr/bin/llvm-config llvm-config /usr/bin/llvm-config-15 100 \
54+
&& update-alternatives --install /usr/bin/llc llc /usr/bin/llc-15 100 \
55+
&& update-alternatives --install /usr/bin/opt opt /usr/bin/opt-15 100 \
56+
&& update-alternatives --install /usr/bin/clang clang /usr/bin/clang-15 100 \
57+
&& update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-15 100 \
58+
&& update-alternatives --install /usr/bin/lld lld /usr/bin/lld-15 100 \
59+
&& update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-15 100
5960

6061

6162
#------------------------------

0 commit comments

Comments
 (0)