diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-09-05 08:47:35 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-07 06:30:43 (GMT) |
| commit | c7d5071afc6c76925c90ff35041dc4eb86511271 (patch) | |
| tree | b3757e395ae8fcd3ebcc6daeac9c8a7d73a83cb9 | |
| parent | fc6569921d4bc06e3d526f18d4b4cd3ef05c2025 (diff) | |
| download | Qt-c7d5071afc6c76925c90ff35041dc4eb86511271.zip Qt-c7d5071afc6c76925c90ff35041dc4eb86511271.tar.gz Qt-c7d5071afc6c76925c90ff35041dc4eb86511271.tar.bz2 | |
Disable rpath, pkg-config, "reduce export" flag when x-compiling for mingw
This patch disables rpath and pkg-config because both are not supported by Windows.
The reduce export flag produces linker errors when Dlls are used.
Partial cherry pick from qtbase/07a978d3d4b41739eff1061dc45dbfa737bf78b9
Change-Id: Iee679373397a2f97780876471a138c7bcddd2c7b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rwxr-xr-x | configure | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1681,7 +1681,13 @@ while [ "$#" -gt 0 ]; do ;; xplatform) XPLATFORM="$VAL" - case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac + case `basename "$XPLATFORM"` in win32-g++*) + XPLATFORM_MINGW=yes + CFG_RPATH=no + PKG_CONFIG=no + CFG_REDUCE_EXPORTS=no + ;; + esac case "$XPLATFORM" in *integrity*) XPLATFORM_INTEGRITY=yes;; esac case "$XPLATFORM" in *symbian*) XPLATFORM_SYMBIAN=yes;; esac case "$XPLATFORM" in symbian-sbsv2) XPLATFORM_SYMBIAN_SBSV2=yes;; esac |