mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-13 07:45:53 +08:00
Bump macOS minimum deployment target to 11 for 3rd party dependencies
3rd party dependencies should be built using the same minimum deployment target as Qt uses for compatibility. Change-Id: I2edb2c19b90757898f6dcb76ad60602ae2249ebc Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
@@ -86,13 +86,13 @@ if [ "$os" == "linux" ]; then
|
||||
|
||||
elif [ "$os" == "macos" ]; then
|
||||
brew install yasm
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.15
|
||||
export MACOSX_DEPLOYMENT_TARGET=11
|
||||
build_ffmpeg
|
||||
sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
|
||||
|
||||
elif [ "$os" == "macos-universal" ]; then
|
||||
brew install yasm
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.15
|
||||
export MACOSX_DEPLOYMENT_TARGET=11
|
||||
build_ffmpeg "arm64"
|
||||
build_ffmpeg "x86_64"
|
||||
|
||||
|
||||
@@ -83,7 +83,7 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
|
||||
|
||||
commonFlags="no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 -Wa,--noexecstack"
|
||||
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.15
|
||||
export MACOSX_DEPLOYMENT_TARGET=11
|
||||
|
||||
opensslBuild="${opensslHome}-build"
|
||||
opensslDestdir="${opensslHome}-destdir"
|
||||
|
||||
@@ -77,7 +77,7 @@ echo "Configuring and building protobuf"
|
||||
|
||||
installPrefix="/usr/local"
|
||||
if uname -a |grep -q Darwin; then
|
||||
extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"
|
||||
extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11"
|
||||
SetEnvVar PATH "\$PATH:$installPrefix/bin"
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user