From f62150b09e303b157cd9edd446ccf256a6c3a33f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 7 Aug 2014 17:25:46 +0200 Subject: qt4: Avoid duplicate flags in the g++-unix.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The removed flags from this g++.conf file, which is installed to the target as g++-unix.conf are added by gcc-base.conf . Do not add those flags twice. (From OE-Core rev: 3c49c575632cdac7bf950439b33773f09ae63354) Signed-off-by: Marek Vasut Cc: Eric Bénard Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4-4.8.6/g++.conf | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'meta') diff --git a/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf index 8755031017..be78c249e9 100644 --- a/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf +++ b/meta/recipes-qt/qt4/qt4-4.8.6/g++.conf @@ -5,32 +5,14 @@ QMAKE_COMPILER = gcc QMAKE_CC = $(OE_QMAKE_CC) -QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) +QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS) QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) -QMAKE_CFLAGS_DEPS += -M -QMAKE_CFLAGS_WARN_ON += -Wall -W -QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -QMAKE_CFLAGS_DEBUG += -g -QMAKE_CFLAGS_SHLIB += -fPIC -QMAKE_CFLAGS_STATIC_LIB += -fPIC -QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} QMAKE_CXX = $(OE_QMAKE_CXX) -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) -QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS) QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB -QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE @@ -39,9 +21,6 @@ QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) QMAKE_LINK_C = $(OE_QMAKE_LINK) QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) -QMAKE_LFLAGS_RELEASE += -QMAKE_LFLAGS_DEBUG += -QMAKE_LFLAGS_APP += QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, -- cgit 1.2.3-korg