From bc41dc5b8fbb637902dfaa0171deb5d6c63909e0 Mon Sep 17 00:00:00 2001 From: Ormund Williams Date: Wed, 13 Jan 2010 17:55:52 -0500 Subject: qt: Re-enable workaround for building on x86 for x86 target, also check for x86_64 [Peter: combined x86 + x86-64 logic, simplified] Signed-off-by: Ormund Williams Signed-off-by: Peter Korsgaard --- package/qt/qt.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'package/qt') diff --git a/package/qt/qt.mk b/package/qt/qt.mk index a3a466ae3..78b2eec3a 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -352,6 +352,16 @@ endif BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM)) +# x86x86fix +# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux +# host. It's unclear if this would happen on other hosts. +ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),) +ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),) +QT_CONFIGURE+= -platform linux-g++ +endif +endif +# End of workaround. + # Figure out what libs to install in the target QT_LIBS=#empty ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) -- cgit v1.2.3