From a68c456e851023606c882f287a398bbaba16f298 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Fri, 23 Nov 2012 15:18:11 +0200 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-qt/meta/meta-toolchain-qte.bb | 10 +++++----- 1 file 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 @@ # 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 -- cgit v1.2.3-54-g00ecf