From 9d90ff85d6d32aa97bb8e61b766bf8947593b640 Mon Sep 17 00:00:00 2001
From: Xiao Shengguang <shengguangxiao@gmail.com>
Date: Sat, 5 Jun 2021 17:44:17 +0800
Subject: [PATCH] Using clang 11 to compile on linux and MacOS (#472)

* Using clang 11 to compile on linux and MacOS

* Revert change to make apple darwin build pass
---
 contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile | 9 +++++++--
 make.sh                                            | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile b/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
index bda63b01bcd..a85c7aaf5b7 100644
--- a/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
+++ b/contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
@@ -16,9 +16,14 @@ RUN apt-get install -y apt-transport-https
 RUN apt install -y software-properties-common build-essential libtool autotools-dev automake \
 pkg-config bsdmainutils python3 libssl-dev libevent-dev libboost-system-dev \
 libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev \
-libminiupnpc-dev libzmq3-dev libqrencode-dev \
+libminiupnpc-dev libzmq3-dev libqrencode-dev wget \
 curl cmake
 
+# install clang 11
+RUN wget https://apt.llvm.org/llvm.sh
+RUN chmod +x llvm.sh
+RUN ./llvm.sh 11
+
 # For Berkeley DB - but we don't need as we do a depends build.
 # RUN apt install -y libdb-dev
 
@@ -47,7 +52,7 @@ COPY . .
 RUN ./autogen.sh
 
 # XREF: #make-configure
-RUN ./configure --prefix=`pwd`/depends/${TARGET}
+RUN ./configure CC=clang-11 CXX=clang++-11 --prefix=`pwd`/depends/${TARGET}
 
 ARG BUILD_VERSION=
 
diff --git a/make.sh b/make.sh
index d127584deca..132712304c6 100755
--- a/make.sh
+++ b/make.sh
@@ -84,7 +84,7 @@ build() {
     popd >/dev/null
     ./autogen.sh
     # XREF: #make-configure
-    ./configure --prefix="$(pwd)/depends/${target}" ${extra_build_opts}
+    ./configure CC=clang-11 CXX=clang++-11 --prefix="$(pwd)/depends/${target}" ${extra_build_opts}
     make $extra_make_args
 }
 
@@ -324,8 +324,11 @@ pkg_install_deps() {
     sudo apt install -y software-properties-common build-essential libtool autotools-dev automake \
         pkg-config bsdmainutils python3 libssl-dev libevent-dev libboost-system-dev \
         libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev \
-        libminiupnpc-dev libzmq3-dev libqrencode-dev \
+        libminiupnpc-dev libzmq3-dev libqrencode-dev wget \
         curl cmake
+    wget https://apt.llvm.org/llvm.sh
+    chmod +x llvm.sh
+    sudo ./llvm.sh 11
 }
 
 pkg_ensure_mac_sdk() {