mirror of
https://gitlab.com/Syping/qt5-llvm-mingw-docker.git
synced 2024-10-03 22:56:04 +02:00
Update Clang to 11.1.0
This commit is contained in:
parent
55b51d0bae
commit
9fa6b61580
3 changed files with 13 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
12
qt_build
12
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}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue