From 189b9a916b845c90db5e51f62496a13f60936d36 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 9 May 2006 16:10:46 +0000 Subject: Sync bbclass files with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@374 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/classes/qmake.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openembedded/classes/qmake.bbclass') diff --git a/openembedded/classes/qmake.bbclass b/openembedded/classes/qmake.bbclass index 10aa8c9f7..4f2fceff3 100644 --- a/openembedded/classes/qmake.bbclass +++ b/openembedded/classes/qmake.bbclass @@ -2,7 +2,7 @@ inherit qmake-base qmake_do_configure() { case ${QMAKESPEC} in - *linux-oe-g++|*linux-uclibc-oe-g++) + *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++) ;; *-oe-g++) die Unsupported target ${TARGET_OS} for oe-g++ qmake spec @@ -47,9 +47,9 @@ qmake_do_configure() { oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" fi -#oenote "Calling 'qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" +#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" unset QMAKESPEC || true - qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling qmake on $PROFILES" + ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" } EXPORT_FUNCTIONS do_configure -- cgit v1.2.3