Commit ac88d10f authored by Ben Gamari's avatar Ben Gamari 🐢

Bump LLVM to 10.0.0

parent 58b4d598
......@@ -10,6 +10,8 @@ RUN apt-get update \
ca-certificates g++ git make automake autoconf gcc \
perl python3 texinfo xz-utils lbzip2 bzip2 patch openssh-client sudo time \
jq wget curl locales libnuma-dev \
# For LLVM
libtinfo5 \
# Documentation tools
python3-sphinx texlive-xetex texlive-latex-extra texlive-binaries texlive-fonts-recommended lmodern texlive-generic-extra \
&& apt-get clean \
......@@ -37,9 +39,10 @@ RUN ghc --version
# LLVM
ENV LLVM_DIR /opt/llvm
ENV LLVM_VERSION 9.0.0
ENV LLVM_VERSION 10.0.0
ENV PATH $LLVM_DIR/bin:$PATH
RUN curl -L https://releases.llvm.org/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-aarch64-linux-gnu.tar.xz | tar -xJC . && \
RUN curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-aarch64-linux-gnu.tar.xz \
| tar -xJC . && \
mkdir $LLVM_DIR && \
cp -R clang+llvm*/* $LLVM_DIR && \
rm -R clang+llvm* && \
......
......@@ -11,6 +11,8 @@ RUN apt-get update \
ca-certificates g++ git make automake autoconf gcc \
perl python3 texinfo xz-utils lbzip2 bzip2 patch openssh-client sudo time \
jq wget curl locales \
# For LLVM
libtinfo5 \
# Documentation tools
python3-sphinx texlive-xetex texlive-latex-extra texlive-binaries texlive-fonts-recommended lmodern texlive-generic-extra \
&& apt-get clean \
......@@ -38,9 +40,10 @@ RUN ghc --version
# LLVM
ENV LLVM_DIR /opt/llvm
ENV LLVM_VERSION 9.0.0
ENV LLVM_VERSION 10.0.0
ENV PATH $LLVM_DIR/bin:$PATH
RUN curl -L https://releases.llvm.org/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-armv7a-linux-gnueabihf.tar.xz | tar -xJC . && \
RUN curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-armv7a-linux-gnueabihf.tar.xz \
| tar -xJC . && \
mkdir $LLVM_DIR && \
cp -R clang+llvm*/* $LLVM_DIR && \
rm -R clang+llvm* && \
......
......@@ -50,9 +50,10 @@ RUN curl -L https://downloads.haskell.org/cabal/cabal-install-$CABAL_VERSION/cab
# LLVM
ENV LLVM_DIR /opt/llvm
ENV LLVM_VERSION 9.0.0
ENV LLVM_VERSION 10.0.0
ENV PATH $LLVM_DIR/bin:$PATH
RUN curl -L https://releases.llvm.org/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-16.04.tar.xz | tar -xJC .; \
RUN curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz \
| tar -xJC .; \
mkdir $LLVM_DIR && \
cp -R clang+llvm*/* $LLVM_DIR && \
rm -R clang+llvm* && \
......
......@@ -24,6 +24,8 @@ RUN apt-get update -qq && apt-get install --no-install-recommends -qy \
libdw1 libdw-dev \
# For nofib
valgrind \
# For LLVM
libtinfo5 \
# Documentation tools
python3-pip texlive-xetex texlive-latex-extra texlive-binaries texlive-fonts-recommended lmodern texlive-generic-extra \
# For cross compilation
......@@ -54,7 +56,8 @@ RUN curl -L https://downloads.haskell.org/cabal/cabal-install-$CABAL_VERSION/cab
ENV LLVM_DIR /opt/llvm
ENV LLVM_VERSION 7.0.0
ENV PATH $LLVM_DIR/bin:$PATH
RUN curl -L https://releases.llvm.org/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-16.04.tar.xz | tar -xJC .; \
RUN curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz \
| tar -xJC .; \
mkdir $LLVM_DIR && \
cp -R clang+llvm*/* $LLVM_DIR && \
rm -R clang+llvm* && \
......
......@@ -52,7 +52,8 @@ RUN curl -L https://downloads.haskell.org/cabal/cabal-install-$CABAL_VERSION/cab
ENV LLVM_DIR /opt/llvm
ENV LLVM_VERSION 9.0.0
ENV PATH $LLVM_DIR/bin:$PATH
RUN curl -L https://releases.llvm.org/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-x86_64-linux-gnu-ubuntu-16.04.tar.xz | tar -xJC .; \
RUN curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz \
| tar -xJC .; \
mkdir $LLVM_DIR && \
cp -R clang+llvm*/* $LLVM_DIR && \
rm -R clang+llvm* && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment