From 3b9636a0a986f87d996a10fcc4b01add5c4d1e64 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 17 Feb 2013 17:53:12 +0000 Subject: 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. (From OE-Core rev: 4ade9c60acea0ac92d0a08f3078361b6f54c85e2) Signed-off-by: Otavio Salvador Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-qt/meta/meta-toolchain-qt.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-qt/meta/meta-toolchain-qt.inc b/meta/recipes-qt/meta/meta-toolchain-qt.inc index 107ba19e25..abf12fb84d 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 -- cgit v1.2.3-54-g00ecf