From 43f802d7ac4692d638e0175c2ef48c1c4393fe10 Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <zcash@adityapk.com>
Date: Sat, 18 May 2019 18:37:39 -0700
Subject: [PATCH] Use clang

---
 src/scripts/docker/Dockerfile | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/scripts/docker/Dockerfile b/src/scripts/docker/Dockerfile
index 55978b8..bfbd138 100644
--- a/src/scripts/docker/Dockerfile
+++ b/src/scripts/docker/Dockerfile
@@ -7,10 +7,14 @@ RUN apt-get -y update && apt-get install -y \
     libgl1-mesa-dev libglu1-mesa-dev libfontconfig1-dev libssl-dev  \
     libfreetype6 libgl1-mesa-glx libglib2.0-0 \
     libx11-6 libx11-xcb1 \
-    g++ build-essential cmake wget git \
+    g++ build-essential cmake wget git clang++-6.0 \
     software-properties-common  \
     autoconf automake autopoint bison flex gperf libtool libtool-bin intltool lzip python ruby unzip p7zip-full libgdk-pixbuf2.0-dev libltdl-dev 
 
+# Hack to make clang work with Qt
+RUN ln -s /usr/bin/clang++-6.0 /usr/bin/clang++ && \
+    ln -s /usr/bin/clang-6.0   /usr/bin/clang
+
 # Get OpenSSL
 RUN cd /opt && wget https://www.openssl.org/source/openssl-1.0.2r.tar.gz && \
     tar xvf openssl-1.0.2r.tar.gz && \
@@ -22,9 +26,15 @@ RUN cd /opt &&  \
     wget https://download.qt.io/archive/qt/5.11/5.11.2/single/qt-everywhere-src-5.11.2.tar.xz && \
     tar xvf qt-everywhere-src-5.11.2.tar.xz && \
     cd qt-everywhere-src-5.11.2 && \
-    OPENSSL_LIBS='-L/opt/openssl-1.0.2r -lssl -lcrypto' ./configure -static -prefix /opt/Qt/5.11.2/static  -skip qtlocation -skip qtmacextras -skip qtpurchasing -skip qtscript -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtdatavis3d -skip qtdoc -skip qtcharts -skip qtdeclarative -skip qt3d -skip qtwebengine -skip qtandroidextras -skip qtwebview -skip qtgamepad -skip qtquickcontrols -skip qtquickcontrols2 -skip qtremoteobjects -skip qtwebview -skip qtwebchannel -skip qtwebglplugin  -nomake examples -nomake tests -qt-zlib -qt-libpng -qt-xcb -qt-xkbcommon -feature-fontconfig -no-feature-getentropy  -release -openssl-linked -opensource -confirm-license && \
-    make -j$(nproc) && make -j4 install && \
-    cd /opt && rm qt-everywhere-src-5.11.2.tar.xz && rm -rf qt-everywhere-src-5.11.2
+    OPENSSL_LIBS='-L/opt/openssl-1.0.2r -lssl -lcrypto' ./configure -static -prefix /opt/Qt/5.11.2/static  -skip qtlocation -skip qtmacextras -skip qtpurchasing -skip qtscript -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtdatavis3d -skip qtdoc -skip qtcharts -skip qtdeclarative -skip qt3d -skip qtwebengine -skip qtandroidextras -skip qtwebview -skip qtgamepad -skip qtquickcontrols -skip qtquickcontrols2 -skip qtremoteobjects -skip qtwebview -skip qtwebchannel -skip qtwebglplugin  -nomake examples -nomake tests -qt-zlib -qt-libpng -qt-xcb -qt-xkbcommon -feature-fontconfig -no-feature-getentropy  -release -openssl-linked -platform linux-clang -opensource -confirm-license 
+
+# Run the make multiple times, because for some reason (multithreading, probably) it fails
+# the first time.
+RUN cd /opt/qt-everywhere-src-5.11.2 && ( make -j$(nproc) || make -j4 || make )
+
+RUN mkdir -p /opt/Qt/5.11.2 && cd /opt/qt-everywhere-src-5.11.2 && make -j4 install
+
+RUN cd /opt && rm qt-everywhere-src-5.11.2.tar.xz && rm -rf qt-everywhere-src-5.11.2
 
 # Get and build MXE
 RUN cd /opt && \