diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-02-17 17:53:12 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-19 08:47:35 -0800 |
commit | 3b9636a0a986f87d996a10fcc4b01add5c4d1e64 (patch) | |
tree | 38eb9d1caef2c7795119f18485236a7936d3c366 | |
parent | c7b23ab68aafc04d9830ef318015912e5d4f0672 (diff) | |
download | poky-3b9636a0a986f87d996a10fcc4b01add5c4d1e64.tar.gz |
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 <otavio@ossystems.com.br>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qt.inc | 2 |
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 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() { | |||
12 | echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script | 12 | echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script |
13 | echo 'export OE_QMAKE_CC=$CC' >> $script | 13 | echo 'export OE_QMAKE_CC=$CC' >> $script |
14 | echo 'export OE_QMAKE_CXX=$CXX' >> $script | 14 | echo 'export OE_QMAKE_CXX=$CXX' >> $script |
15 | echo 'export OE_QMAKE_LINK=$LD' >> $script | 15 | echo 'export OE_QMAKE_LINK=$CXX' >> $script |
16 | echo 'export OE_QMAKE_AR=$AR' >> $script | 16 | echo 'export OE_QMAKE_AR=$AR' >> $script |
17 | echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script | 17 | echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script |
18 | echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script | 18 | echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script |