aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/meta
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:06 +0000
commit758f56523daa7d8c8b459757c70b50421d28b8dd (patch)
tree7a459ef5c56d9b5e67e507c35ee81271e37ca80d /meta/recipes-qt/meta
parent77cd1218bbd0760f674811eb748037deb4478db5 (diff)
downloadopenembedded-core-contrib-758f56523daa7d8c8b459757c70b50421d28b8dd.tar.gz
openembedded-core-contrib-758f56523daa7d8c8b459757c70b50421d28b8dd.tar.bz2
openembedded-core-contrib-758f56523daa7d8c8b459757c70b50421d28b8dd.zip
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] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@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-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 20dd354e17a..7c2ae495a0f 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -1,5 +1,5 @@
# Qt Embedded toolchain
-PR = "r5"
+PR = "r6"
TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-qte-toolchain-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
TOOLCHAIN_TARGET_TASK = "packagegroup-qte-toolchain-target"
TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}"
@@ -13,10 +13,10 @@ toolchain_create_sdk_env_script_append() {
echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
- echo 'export OE_QMAKE_CC=${TARGET_PREFIX}gcc' >> $script
- echo 'export OE_QMAKE_CXX=${TARGET_PREFIX}g++' >> $script
- echo 'export OE_QMAKE_LINK=${TARGET_PREFIX}g++' >> $script
- echo 'export OE_QMAKE_AR=${TARGET_PREFIX}ar' >> $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_AR=$AR' >> $script
echo 'export OE_QMAKE_LIBDIR_QT=${SDKTARGETSYSROOT}/${libdir}' >> $script
echo 'export OE_QMAKE_INCDIR_QT=${SDKTARGETSYSROOT}/${includedir}/${QT_DIR_NAME}' >> $script
echo 'export OE_QMAKE_MOC=${QT_TOOLS_PREFIX}/moc4' >> $script