aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/meta
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-02-17 17:53:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-19 08:32:11 -0800
commit4ade9c60acea0ac92d0a08f3078361b6f54c85e2 (patch)
tree7b9eb0a9cbb049151b1410451bbaa45ac40f8029 /meta/recipes-qt/meta
parentcd503c7f7fec6d177209832f73cec9c5d490be6b (diff)
downloadopenembedded-core-contrib-4ade9c60acea0ac92d0a08f3078361b6f54c85e2.tar.gz
openembedded-core-contrib-4ade9c60acea0ac92d0a08f3078361b6f54c85e2.tar.bz2
openembedded-core-contrib-4ade9c60acea0ac92d0a08f3078361b6f54c85e2.zip
meta-toolchain-qt.inc: Use CXX when linking
We should use CXX compiler when linking objects as done in regular builds inside of OE-Core. This fixes issues we've been seeing in field where we needed to change it byhand so the toolchain could work. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/meta')
-rw-r--r--meta/recipes-qt/meta/meta-toolchain-qt.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/meta/recipes-qt/meta/meta-toolchain-qt.inc
index 107ba19e25c..abf12fb84db 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qt.inc
+++ b/meta/recipes-qt/meta/meta-toolchain-qt.inc
@@ -12,7 +12,7 @@ toolchain_create_sdk_env_script_append() {
echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
echo 'export OE_QMAKE_CC=$CC' >> $script
echo 'export OE_QMAKE_CXX=$CXX' >> $script
- echo 'export OE_QMAKE_LINK=$LD' >> $script
+ echo 'export OE_QMAKE_LINK=$CXX' >> $script
echo 'export OE_QMAKE_AR=$AR' >> $script
echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script
echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script