From 9fa6b61580256755032e4336adf86a6d24acb9e0 Mon Sep 17 00:00:00 2001
From: Syping <schiedelrafael@keppe.org>
Date: Thu, 25 Feb 2021 11:34:17 +0100
Subject: [PATCH] Update Clang to 11.1.0
---
Dockerfile.shared | 2 +-
Dockerfile.static | 2 +-
qt_build | 12 +++++++++++-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Dockerfile.shared b/Dockerfile.shared
index 35d1d55..8e58eb2 100644
--- a/Dockerfile.shared
+++ b/Dockerfile.shared
@@ -1,4 +1,4 @@
-FROM syping/llvm-mingw-debian:11.0.1
+FROM syping/llvm-mingw-debian:11.1.0
# Custom Directory
ENV CUSTOM_DIRECTORY YES
diff --git a/Dockerfile.static b/Dockerfile.static
index 337a700..23a9c8b 100644
--- a/Dockerfile.static
+++ b/Dockerfile.static
@@ -1,4 +1,4 @@
-FROM syping/llvm-mingw-debian:11.0.1
+FROM syping/llvm-mingw-debian:11.1.0
# Custom Directory
ENV CUSTOM_DIRECTORY YES
diff --git a/qt_build b/qt_build
index 3cd9de2..4931125 100755
--- a/qt_build
+++ b/qt_build
@@ -461,7 +461,17 @@ function openssl_build {
else
local EXTRA_FLAGS=no-shared
fi
- "${SOURCE_DIR_OPENSSL}/Configure" ${SSL_PLATFORM} ${EXTRA_FLAGS} --cross-compile-prefix=${COMPILER}- --prefix="${PREFIX_DIR}/lib/${COMPILER}/openssl-${OPENSSL_VERSION}${TARGET_SUFFIX}"
+ if [ "${USE_CLANG}" == "YES" ]; then
+ local CC=clang
+ local CXX=clang++
+ elif [ "${USE_GCC}" == "YES" ]; then
+ local CC=gcc
+ local CXX=g++
+ else
+ local CC=cc
+ local CXX=c++
+ fi
+ CC=${CC} CXX=${CXX} "${SOURCE_DIR_OPENSSL}/Configure" ${SSL_PLATFORM} ${EXTRA_FLAGS} --cross-compile-prefix=${COMPILER}- --prefix="${PREFIX_DIR}/lib/${COMPILER}/openssl-${OPENSSL_VERSION}${TARGET_SUFFIX}"
${MAKE_GENERATOR}
}