diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-05-09 16:10:46 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-05-09 16:10:46 +0000 |
| commit | 189b9a916b845c90db5e51f62496a13f60936d36 (patch) | |
| tree | e9227d9f63eea070317afffd41cbcdfed018753f /openembedded/classes/qmake.bbclass | |
| parent | 8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c (diff) | |
| download | openembedded-core-189b9a916b845c90db5e51f62496a13f60936d36.tar.gz openembedded-core-189b9a916b845c90db5e51f62496a13f60936d36.tar.bz2 openembedded-core-189b9a916b845c90db5e51f62496a13f60936d36.tar.xz openembedded-core-189b9a916b845c90db5e51f62496a13f60936d36.zip | |
Sync bbclass files with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@374 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/classes/qmake.bbclass')
| -rw-r--r-- | openembedded/classes/qmake.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
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 |