38 lines
1.8 KiB
Diff
38 lines
1.8 KiB
Diff
From 7b32e9b9f45a8fd6e1b2a8ac9a70ab68741f370f Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 3 Feb 2019 14:34:42 +0100
|
|
Subject: [PATCH 32/33] Prevent static build to prefer dynamic libraries
|
|
|
|
The static build should not attempt to link against dynamic libraries
|
|
in order to get a fully statically linked binary in the end.
|
|
---
|
|
mkspecs/features/qt_configure.prf | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
|
|
index 9be4fb6f1f..6a006b3586 100644
|
|
--- a/mkspecs/features/qt_configure.prf
|
|
+++ b/mkspecs/features/qt_configure.prf
|
|
@@ -577,12 +577,12 @@ defineTest(qtConfResolveLibs) {
|
|
# Under Windows, we look only for static libraries, as even for DLLs
|
|
# one actually links against a static import library.
|
|
mingw {
|
|
- lcan += \
|
|
- # MinGW supports UNIX-style library naming in addition to
|
|
- # the MSVC style.
|
|
- lib$${lib}.dll.a lib$${lib}.a \
|
|
- # Fun fact: prefix-less libraries are also supported.
|
|
- $${lib}.dll.a $${lib}.a
|
|
+ # prefer (import) libraries for dynamic linking unless we're doing a
|
|
+ # static build where we solely rely on presence of static libraries
|
|
+ shared {
|
|
+ lcan += $${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_IMPORTLIB} $${lib}.$${QMAKE_EXTENSION_IMPORTLIB}
|
|
+ }
|
|
+ lcan += $${QMAKE_PREFIX_STATICLIB}$${lib}.$${QMAKE_EXTENSION_STATICLIB} $${lib}.$${QMAKE_EXTENSION_STATICLIB}
|
|
}
|
|
lcan += $${lib}.lib
|
|
}
|
|
--
|
|
2.23.0
|
|
|