From e3224554272600a22fd9d22bdb754832b5127da2 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 3 Sep 2012 14:50:33 +0100 Subject: [PATCH] QNX: Tidy up QMAKE_LFLAGS in qnx mkspecs We do not need to include -lang-c++ more than once in QMAKE_LFLAGS* variables. The fact that this was not appearing more than once was due to QMAKE_LFLAGS being overwritten (rather than appended to) in qcc-base-qnx.conf and a weird coincindence in qmake's code to dedupe libraries passed in to QMAKE_LFLAGS. The deduping was working based upon options beginning with "-l", including the -lang-c++ option here. Change-Id: I983f216c0e362a9fe6a924074c5d84aaa659a14f Reviewed-by: Oswald Buddenhagen --- mkspecs/common/qcc-base-qnx.conf | 2 +- mkspecs/common/qcc-base.conf | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf index 6049b31..68a4182 100644 --- a/mkspecs/common/qcc-base-qnx.conf +++ b/mkspecs/common/qcc-base-qnx.conf @@ -43,7 +43,7 @@ isEmpty(QNX_DIR) { QMAKE_INCDIR = $${QNX_DIR}/usr/include $${QNX_DIR}/usr/include/freetype2 QMAKE_LIBDIR = $${QNX_DIR}/$${QNX_CPUDIR}/lib $${QNX_DIR}/$${QNX_CPUDIR}/usr/lib -QMAKE_LFLAGS = -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/lib -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/usr/lib +QMAKE_LFLAGS += -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/lib -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/usr/lib QMAKE_CXXFLAGS_CXX11 = -Wc,-std=gnu++0x diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf index 3207a42..42a2d31 100644 --- a/mkspecs/common/qcc-base.conf +++ b/mkspecs/common/qcc-base.conf @@ -48,7 +48,3 @@ QMAKE_CXXFLAGS_PRECOMPILE = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_P QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE QMAKE_LFLAGS += -lang-c++ -QMAKE_LFLAGS_DEBUG += -lang-c++ -QMAKE_LFLAGS_APP += -lang-c++ -QMAKE_LFLAGS_RELEASE += -lang-c++ - -- 2.7.4