From d4dab10d0b2e770be63348e9ff58b9ba195d1b5c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 25 Jun 2009 10:43:24 +0200 Subject: [PATCH] Fix Qtopia build with external toolchain The fixes made to qmake.conf for the cross-compiling tools were not sufficient in the case of an external toolchain, since the CFLAGS were not taken into account. And the --sysroot option contained in the CFLAGS are very important for external toolchains to work. Additionally, it makes sure that Qtopia is compiled with the proper CFLAGS, even if an external toolchain isn't used. --- package/qtopia4/qtopia4.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index a198a41bd..fb027dcee 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -440,6 +440,8 @@ endif $(call QTOPIA4_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY)) $(call QTOPIA4_QMAKE_SET,RANLIB,$(TARGET_RANLIB)) $(call QTOPIA4_QMAKE_SET,STRIP,$(TARGET_STRIP)) + $(call QTOPIA4_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS)) + $(call QTOPIA4_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS)) -[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \ $(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION) # Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'.