diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2012-09-18 21:40:22 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-21 11:23:47 +0200 |
| commit | 94253f3472a13ac4eab3ccfbbba9d14165647f85 (patch) | |
| tree | eee0c4bd7b7c78bf43ace2990b89a55b44a777dd /configure | |
| parent | 3a6c8cdb0bed87622c2e1e9fca5c2fa03028be9c (diff) | |
configure: mac features don't belong on cross mingw target
CFG_MAC_DWARF2 and CFG_MAC_XARCH options are for targetting macs, not
bulding on them.
qt5/qtbase commit 7a67c822e3e552d0d881f0409a5316de07dbb8c7
removed CFG_MAC_DWARF2.
qt5/qtbase commit 59d5c26075724a581ed276d62d884b44d2ca4489
removed CFG_MAC_XARCH.
Change-Id: Idb789ed9a8aa9b824a4c2191a9c39e741ca49574
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -3418,6 +3418,11 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; CFG_PRECOMPILE=no fi +if [ "$XPLATFORM_MINGW" = "yes" ]; then + CFG_MAC_DWARF2=no + CFG_MAC_XARCH=no +fi + #auto-detect DWARF2 on the mac if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then |