From 125e2558b2ec253d255bf3a1fb2950efc358c8d2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 2 May 2011 23:58:20 +0200 Subject: Get rid of unneeded CFLAGS Now that we use a wrapper for external toolchains (and internal ones default to the correct setting), we no longer need to explicitly pass sysroot/march/mtune/mabi/floating point mode in TARGET_CFLAGS. Signed-off-by: Peter Korsgaard --- package/qt/qt.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/qt') diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 8d7238eab..7ec7ccc5e 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -451,16 +451,16 @@ define QT_CONFIGURE_CMDS $(QT_CONFIGURE_IPV6) $(QT_CONFIGURE_CONFIG_FILE) # Fix compiler path - $(call QT_QMAKE_SET,CC,$(filter-out --sysroot=%,$(TARGET_CC)),$(@D)) - $(call QT_QMAKE_SET,CXX,$(filter-out --sysroot=%,$(TARGET_CXX)),$(@D)) + $(call QT_QMAKE_SET,CC,$(TARGET_CC),$(@D)) + $(call QT_QMAKE_SET,CXX,$(TARGET_CXX),$(@D)) $(call QT_QMAKE_SET,LINK,$(TARGET_CXX),$(@D)) $(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX),$(@D)) $(call QT_QMAKE_SET,AR,$(TARGET_AR) cqs,$(@D)) $(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY),$(@D)) $(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB),$(@D)) $(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP),$(@D)) - $(call QT_QMAKE_SET,CFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CFLAGS),$(@D)) - $(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CXXFLAGS),$(@D)) + $(call QT_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS),$(@D)) + $(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS),$(@D)) $(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS),$(@D)) # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target # instead of the host then. So set PKG_CONFIG* manually. -- cgit v1.2.3