[PATCH] D42304: [Dockerfiles] Use a newer version of ninja when building inside debian8.

[Phabricator via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL323134: [Dockerfiles] Use a newer version of ninja when building inside debian8. (authored by ibiryukov, committed by ).

Repository:
  rL LLVM

https://reviews.llvm.org/D42304

Files:
  llvm/trunk/utils/docker/debian8/build/Dockerfile


Index: llvm/trunk/utils/docker/debian8/build/Dockerfile
===================================================================
--- llvm/trunk/utils/docker/debian8/build/Dockerfile
+++ llvm/trunk/utils/docker/debian8/build/Dockerfile
@@ -19,9 +19,17 @@
 # Install compiler, python and subversion.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends ca-certificates gnupg \
-           build-essential python wget subversion ninja-build && \
+           build-essential python wget subversion unzip && \
     rm -rf /var/lib/apt/lists/*
 
+# Install a newer ninja release. It seems the older version in the debian repos
+# randomly crashes when compiling llvm.
+RUN wget "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip" && \
+    echo "d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07 ninja-linux.zip" \
+        | sha256sum -c  && \
+    unzip ninja-linux.zip -d /usr/local/bin && \
+    rm ninja-linux.zip
+
 # Import public key required for verifying signature of cmake download.
 RUN gpg --keyserver hkp://pgp.mit.edu --recv 0x2D2CEF1034921684
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D42304.130916.patch
Type: text/x-patch
Size: 1113 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180122/16eb34a7/attachment.bin>