diff options
author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-09-03 14:50:33 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-03 20:33:48 +0200 |
commit | e3224554272600a22fd9d22bdb754832b5127da2 (patch) | |
tree | 6b3abbfc255fd39b9422ff84e3380bc89e9fe2af | |
parent | 5a1fa8860ca466bc109f1195e1e4b92c0c92018d (diff) |
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 <oswald.buddenhagen@nokia.com>
-rw-r--r-- | mkspecs/common/qcc-base-qnx.conf | 2 | ||||
-rw-r--r-- | mkspecs/common/qcc-base.conf | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf index 6049b31bc8..68a4182e0f 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 3207a42a83..42a2d31739 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++ - |