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} }