this should fix cmake on Ubuntu 14.04

This commit is contained in:
Andrew Stanton-Nurse 2015-11-03 10:08:59 -08:00
parent ee84f498fa
commit bf0b0c93cb
2 changed files with 7 additions and 10 deletions

View file

@ -12,15 +12,7 @@ RUN apt-get update && \
RUN echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee /etc/apt/sources.list.d/llvm.list && \
curl http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - && \
apt-get update && \
apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev lldb-3.6-dev lldb-3.6 clang
# Install latest cmake
RUN mkdir -p /opt/src/cmake && \
cd /opt/src/cmake && \
curl -O https://cmake.org/files/v3.4/cmake-3.4.0-rc2-Linux-x86_64.tar.gz && \
tar xzf cmake-3.4.0-rc2-Linux-x86_64.tar.gz && \
cd cmake-3.4.0-rc2-Linux-x86_64 && \
ln -s /opt/src/cmake/cmake-3.4.0-rc2-Linux-x86_64/bin/cmake /usr/local/bin/cmake
apt-get install -y debhelper build-essential devscripts git liblttng-ust-dev lldb-3.6-dev lldb-3.6 clang cmake
# Use clang as c++ compiler
RUN update-alternatives --set c++ /usr/bin/clang++