From 038e3715707e676fe47ad79322f94b0a0fe60b7d Mon Sep 17 00:00:00 2001
From: Ivan <5627721+abyss7@users.noreply.github.com>
Date: Thu, 7 May 2020 15:32:17 +0300
Subject: [PATCH] Update cross-builds to use clang-10 compiler (#10724)

* Update FreeBSD toolchain
* Update cross-builds to use clang-10
---
 cmake/toolchain/freebsd-x86_64/README.txt | 2 ++
 docker/packager/binary/Dockerfile         | 4 ++--
 docker/packager/binary/build.sh           | 2 +-
 docker/packager/packager                  | 2 +-
 utils/s3tools/s3uploader                  | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 cmake/toolchain/freebsd-x86_64/README.txt

diff --git a/cmake/toolchain/freebsd-x86_64/README.txt b/cmake/toolchain/freebsd-x86_64/README.txt
new file mode 100644
index 0000000000..f9fb74f417
--- /dev/null
+++ b/cmake/toolchain/freebsd-x86_64/README.txt
@@ -0,0 +1,2 @@
+wget https://clickhouse-datasets.s3.yandex.net/toolchains/toolchains/freebsd-11.3-toolchain.tar.xz
+tar xJf freebsd-11.3-toolchain.tar.xz --strip-components=1
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 93ac0eaff6..784d213033 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -72,8 +72,8 @@ RUN wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.14-beta4/M
 # It contains all required headers and libraries. Note that it's named as "gcc" but actually we are using clang for cross compiling.
 RUN wget "https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz?revision=2e88a73f-d233-4f96-b1f4-d8b36e9bb0b9&la=en" -O gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz
 
-# Download toolchain for FreeBSD 12.1
-RUN wget https://clickhouse-datasets.s3.yandex.net/toolchains/toolchains/freebsd-12.1-toolchain.tar.xz
+# Download toolchain for FreeBSD 11.3
+RUN wget https://clickhouse-datasets.s3.yandex.net/toolchains/toolchains/freebsd-11.3-toolchain.tar.xz
 
 COPY build.sh /
 CMD ["/bin/bash", "/build.sh"]
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary/build.sh
index a341bbd984..d1c295d4af 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary/build.sh
@@ -9,7 +9,7 @@ mkdir -p build/cmake/toolchain/linux-aarch64
 tar xJf gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz -C build/cmake/toolchain/linux-aarch64 --strip-components=1
 
 mkdir -p build/cmake/toolchain/freebsd-x86_64
-tar xJf freebsd-12.1-toolchain.tar.xz -C build/cmake/toolchain/freebsd-x86_64 --strip-components=1
+tar xJf freebsd-11.3-toolchain.tar.xz -C build/cmake/toolchain/freebsd-x86_64 --strip-components=1
 
 mkdir -p build/build_docker
 cd build/build_docker
diff --git a/docker/packager/packager b/docker/packager/packager
index 40e0f34658..5b5f94f708 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -165,7 +165,7 @@ if __name__ == "__main__":
     parser.add_argument("--clickhouse-repo-path", default="../../")
     parser.add_argument("--output-dir", required=True)
     parser.add_argument("--build-type", choices=("debug", ""), default="")
-    parser.add_argument("--compiler", choices=("clang-8", "clang-8-darwin", "clang-9-aarch64", "clang-9-freebsd", "gcc-9", "clang-9", "clang-10"), default="gcc-9")
+    parser.add_argument("--compiler", choices=("clang-10-darwin", "clang-10-aarch64", "clang-10-freebsd", "gcc-9", "clang-10"), default="gcc-9")
     parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
     parser.add_argument("--unbundled", action="store_true")
     parser.add_argument("--split-binary", action="store_true")
diff --git a/utils/s3tools/s3uploader b/utils/s3tools/s3uploader
index cb1cd52228..66322be623 100755
--- a/utils/s3tools/s3uploader
+++ b/utils/s3tools/s3uploader
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
 import os
 import logging
-- 
GitLab