Syping/qt5-llvm-mingw-docker
1
0
Fork 0
mirror of https://gitlab.com/Syping/qt5-llvm-mingw-docker.git synced 2024-11-21 13:20:22 +01:00
Code Issues Projects Releases Wiki Activity

Update Clang to 11.1.0

Browse source
This commit is contained in:
Syping 2021-02-25 11:34:17 +01:00
parent 55b51d0bae
commit 9fa6b61580
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.shared
View file

@ -1,4 +1,4 @@
FROM syping/llvm-mingw-debian:11.0.1 FROM syping/llvm-mingw-debian:11.1.0
# Custom Directory # Custom Directory
ENV CUSTOM_DIRECTORY YES ENV CUSTOM_DIRECTORY YES

2
Dockerfile.static
View file

@ -1,4 +1,4 @@
FROM syping/llvm-mingw-debian:11.0.1 FROM syping/llvm-mingw-debian:11.1.0
# Custom Directory # Custom Directory
ENV CUSTOM_DIRECTORY YES ENV CUSTOM_DIRECTORY YES

12
qt_build
View file

@ -461,7 +461,17 @@ function openssl_build {
else else
local EXTRA_FLAGS=no-shared local EXTRA_FLAGS=no-shared
fi 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} ${MAKE_GENERATOR}
} }