From 94253f3472a13ac4eab3ccfbbba9d14165647f85 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 18 Sep 2012 21:40:22 +0200 Subject: 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 --- configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure b/configure index b6e2d11..3b87a6f 100755 --- a/configure +++ b/configure @@ -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 -- cgit v0.12