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 <ormundw@panix.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Ormund Williams 2010-01-13 17:55:52 -05:00 committed by Peter Korsgaard
parent 5a352cdeba
commit bc41dc5b8f

View File

@ -352,6 +352,16 @@ endif
BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM)) 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 # Figure out what libs to install in the target
QT_LIBS=#empty QT_LIBS=#empty
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)