mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into compilenative

Browse source
This commit is contained in:
Bryan Thornbury 2015-10-30 15:49:58 -07:00
commit 8a7a74ff5f
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/docker/Dockerfile
View file

@ -17,14 +17,10 @@ RUN echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | tee
# 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.tar.gz && \
tar xzf cmake-3.4.0-rc2.tar.gz && \
cd cmake-3.4.0-rc2 && \
./bootstrap && \
make && \
make install && \
cd /opt && \
rm -Rf /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
# Use clang as c++ compiler
RUN update-alternatives --set c++ /usr/bin/clang++