meta-toolchain-qte: add --sysroot option to OE_QMAKE_(CC|CXX|LD)

Submitted by Laurentiu Palcu on Nov. 23, 2012, 1:18 p.m.

Details

Message ID 1353676691-27305-1-git-send-email-laurentiu.palcu@intel.com
State Accepted
Commit a68c456e851023606c882f287a398bbaba16f298
Headers show

Commit Message

Laurentiu Palcu Nov. 23, 2012, 1:18 p.m.
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>
---
 meta/recipes-qt/meta/meta-toolchain-qte.bb |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 20dd354..7c2ae49 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