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.

Change-Id: I667c8d722105c6117fcd8ff3102dbdfcb890b24f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

diff --git a/mkspecs/common/qcc-base-qnx-armv7le.conf b/mkspecs/common/qcc-base-qnx-armv7le.conf
index 8270a27..b54eb3e 100644 (file)
--- a/mkspecs/common/qcc-base-qnx-armv7le.conf
+++ b/mkspecs/common/qcc-base-qnx-armv7le.conf
@@ -12,6 +12,7 @@ include(g++-unix.conf)
 include(unix.conf)
 
 QMAKE_CC                = qcc -Vgcc_ntoarmv7le
+QMAKE_CXX               = qcc -Vgcc_ntoarmv7le
 QNX_CPUDIR              = armle-v7
 
 include(qcc-base-qnx.conf)

diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf
index 5e88ba8..4983a98 100644 (file)
--- a/mkspecs/common/qcc-base-qnx-x86.conf
+++ b/mkspecs/common/qcc-base-qnx-x86.conf
@@ -12,6 +12,7 @@ include(g++-unix.conf)
 include(unix.conf)
 
 QMAKE_CC                = qcc -Vgcc_ntox86
+QMAKE_CXX               = qcc -Vgcc_ntox86
 QNX_CPUDIR              = x86
 
 include(qcc-base-qnx.conf)

diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf
index 0f8de66..6049b31 100644 (file)
--- a/mkspecs/common/qcc-base-qnx.conf
+++ b/mkspecs/common/qcc-base-qnx.conf
@@ -45,7 +45,6 @@ QMAKE_INCDIR            = $${QNX_DIR}/usr/include $${QNX_DIR}/usr/include/freety
 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_CXX               = $$QMAKE_CC -lang-c++
 QMAKE_CXXFLAGS_CXX11    = -Wc,-std=gnu++0x
 
 QMAKE_LINK_C            = $$QMAKE_CC

diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf
index 57ff1e4..7f4cc3e 100644 (file)
--- a/mkspecs/common/qcc-base.conf
+++ b/mkspecs/common/qcc-base.conf
@@ -30,7 +30,7 @@ QMAKE_CFLAGS_AVX2           += -mavx2
 QMAKE_CFLAGS_IWMMXT         += -mcpu=iwmmxt
 QMAKE_CFLAGS_NEON           += -mfpu=neon
 
-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
@@ -42,8 +42,8 @@ QMAKE_CXXFLAGS_APP        += $$QMAKE_CFLAGS_APP
 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++
+QMAKE_LFLAGS_DEBUG   += -lang-c++
+QMAKE_LFLAGS_APP     += -lang-c++
+QMAKE_LFLAGS_RELEASE += -lang-c++