diff options
| author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-08-31 13:52:07 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-04 12:23:52 +0200 |
| commit | 9e658e82c9df52db2b0c39caa1e4e4ad3e5afe88 (patch) | |
| tree | a26c9d81ba656e04bfe62dfa3661486768b0fad6 /mkspecs | |
| parent | 07ec091005e49a2e391c37eb2427251f8aec671b (diff) | |
Decouple -lang-c++ from CXX command on QNX mkspecs
Making -lang-c++ integral part of the $CXX command was wrong, because there are
cases where $CXX must be called without the -lang-c++ file (when building asm
files for instance). This commit moves the -lang-c++ to $CXX_FLAGS where it
belongs.
Backport of commits
f4f185edd9dda513320e23b9a3e3f92be203884f
e3224554272600a22fd9d22bdb754832b5127da2
Change-Id: I18be06411648281bd42f3c40b8add637cd7ddfa0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/qcc-base-qnx.conf | 4 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base.conf | 7 | ||||
| -rw-r--r-- | mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/unsupported/qnx-x86-qcc/qmake.conf | 1 |
4 files changed, 5 insertions, 8 deletions
diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf index 2bc33117bb..ecef13e612 100644 --- a/mkspecs/common/qcc-base-qnx.conf +++ b/mkspecs/common/qcc-base-qnx.conf @@ -37,7 +37,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_INCDIR_QT = $$[QT_INSTALL_HEADERS] QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] @@ -45,8 +45,6 @@ QMAKE_MOC = $$[QT_INSTALL_BINS]/moc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_RCC = $$[QT_INSTALL_BINS]/rcc -QMAKE_CXX = $$QMAKE_CC -lang-c++ - QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf index e7508a01c3..db396bd4dd 100644 --- a/mkspecs/common/qcc-base.conf +++ b/mkspecs/common/qcc-base.conf @@ -19,7 +19,7 @@ QMAKE_CFLAGS_STATIC_LIB += -fPIC QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -lang-c++ QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF @@ -30,10 +30,7 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden -QMAKE_LFLAGS += -QMAKE_LFLAGS_DEBUG += -QMAKE_LFLAGS_APP += -QMAKE_LFLAGS_RELEASE += +QMAKE_LFLAGS += -lang-c++ DEFINES += QT_NO_IMPORT_QT47_QML diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf index 76baa5cbb1..de0d5db290 100644 --- a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf +++ b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf @@ -12,6 +12,7 @@ include(../../common/g++-unix.conf) include(../../common/unix.conf) QMAKE_CC = qcc -Vgcc_ntoarmv7le +QMAKE_CXX = qcc -Vgcc_ntoarmv7le QNX_CPUDIR = armle-v7 include(../../common/qcc-base-qnx.conf) diff --git a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf index edf5ae61a2..55584c29eb 100644 --- a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf +++ b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf @@ -12,6 +12,7 @@ include(../../common/g++-unix.conf) include(../../common/unix.conf) QMAKE_CC = qcc -Vgcc_ntox86 +QMAKE_CXX = qcc -Vgcc_ntox86 QNX_CPUDIR = x86 include(../../common/qcc-base-qnx.conf) |