69bd238ad8
Qt couldn't be configured with -system-zlib on macOS, because qmake failed to find "/usr/lib/libz.dylib". The library path is something along the lines of "/Applications/Xcode.app/.../MacOSX10.14.sdk/usr/lib" which doesn't contain "libz.dylib". But it contains "libz.tbd", which is a YAML-file pointing to "/usr/lib/libz.dylib". One can pass the absolute path to this tbd file to the linker, which will then pick up "/usr/lib/libz.dylib". Introduce a new variable QMAKE_EXTENSIONS_AUX_SHLIB, which is a list of auxiliary extensions for shared libs, and add the "tbd" extension to it on macOS. Change-Id: I083b79a69d00232e35f9d6164ffa86cb473f1742 Fixes: QTBUG-72745 Fixes: QTBUG-72964 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> |
||
---|---|---|
.. | ||
aix | ||
android | ||
bsd | ||
c89 | ||
integrity | ||
mac | ||
nacl | ||
posix | ||
qnx | ||
uikit | ||
winrt_winphone | ||
android-base-head.conf | ||
android-base-tail.conf | ||
angle.conf | ||
clang-mac.conf | ||
clang.conf | ||
g++-base.conf | ||
g++-macx.conf | ||
g++-unix.conf | ||
g++-win32.conf | ||
g++.conf | ||
gcc-base-mac.conf | ||
gcc-base-unix.conf | ||
gcc-base.conf | ||
ghs-base.conf | ||
ghs-integrity-armv7.conf | ||
ghs-integrity-armv8.conf | ||
ghs-integrity-x86.conf | ||
icc-base-unix.conf | ||
ios.conf | ||
linux.conf | ||
llvm.conf | ||
mac.conf | ||
macx.conf | ||
msvc-based-version.conf | ||
msvc-desktop.conf | ||
msvc-version.conf | ||
qcc-base-qnx-aarch64le.conf | ||
qcc-base-qnx-armle-v7.conf | ||
qcc-base-qnx-x86-64.conf | ||
qcc-base-qnx-x86.conf | ||
qcc-base-qnx.conf | ||
qcc-base.conf | ||
sanitize.conf | ||
shell-unix.conf | ||
shell-win32.conf | ||
solaris.conf | ||
tvos.conf | ||
uikit.conf | ||
unix.conf | ||
watchos.conf | ||
windows-vulkan.conf |