summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-11-23 15:18:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-24 15:12:33 +0000
commita68c456e851023606c882f287a398bbaba16f298 (patch)
tree7538203a89b01a5e2d870284069d494a62552680 /meta/recipes-qt
parent5e744f510e57b25c7cf5443daadedb9d249d2403 (diff)
downloadpoky-a68c456e851023606c882f287a398bbaba16f298.tar.gz
meta-toolchain-qte: add --sysroot option to OE_QMAKE_(CC|CXX|LD)
When building a QT application using OE_QMAKE_CC/OE_QMAKE_CXX, the --sysroot was not included and the compilation would fail. The user had to add the option manually which was not very user friendly. This happened only when installing the SDK in another location than the default one. Since CC/CXX/LD had this option already included, reuse them. [YOCTO #3409] (From OE-Core rev: 758f56523daa7d8c8b459757c70b50421d28b8dd) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/meta/meta-toolchain-qte.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 20dd354e17..7c2ae495a0 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -1,5 +1,5 @@
1# Qt Embedded toolchain 1# Qt Embedded toolchain
2PR = "r5" 2PR = "r6"
3TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-qte-toolchain-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}" 3TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-qte-toolchain-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
4TOOLCHAIN_TARGET_TASK = "packagegroup-qte-toolchain-target" 4TOOLCHAIN_TARGET_TASK = "packagegroup-qte-toolchain-target"
5TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" 5TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}"
@@ -13,10 +13,10 @@ toolchain_create_sdk_env_script_append() {
13 echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script 13 echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
14 echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script 14 echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
15 echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script 15 echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
16 echo 'export OE_QMAKE_CC=${TARGET_PREFIX}gcc' >> $script 16 echo 'export OE_QMAKE_CC=$CC' >> $script
17 echo 'export OE_QMAKE_CXX=${TARGET_PREFIX}g++' >> $script 17 echo 'export OE_QMAKE_CXX=$CXX' >> $script
18 echo 'export OE_QMAKE_LINK=${TARGET_PREFIX}g++' >> $script 18 echo 'export OE_QMAKE_LINK=$LD' >> $script
19 echo 'export OE_QMAKE_AR=${TARGET_PREFIX}ar' >> $script 19 echo 'export OE_QMAKE_AR=$AR' >> $script
20 echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script 20 echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script
21 echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script 21 echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script
22 echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script 22 echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script