diff options
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 10aa8c9f7d..4f2fceff35 100644 --- a/openembedded/classes/qmake.bbclass +++ b/openembedded/classes/qmake.bbclass | |||
| @@ -2,7 +2,7 @@ inherit qmake-base | |||
| 2 | 2 | ||
| 3 | qmake_do_configure() { | 3 | qmake_do_configure() { |
| 4 | case ${QMAKESPEC} in | 4 | case ${QMAKESPEC} in |
| 5 | *linux-oe-g++|*linux-uclibc-oe-g++) | 5 | *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++) |
| 6 | ;; | 6 | ;; |
| 7 | *-oe-g++) | 7 | *-oe-g++) |
| 8 | die Unsupported target ${TARGET_OS} for oe-g++ qmake spec | 8 | die Unsupported target ${TARGET_OS} for oe-g++ qmake spec |
| @@ -47,9 +47,9 @@ qmake_do_configure() { | |||
| 47 | oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" | 47 | oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" |
| 48 | fi | 48 | fi |
| 49 | 49 | ||
| 50 | #oenote "Calling 'qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" | 50 | #oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" |
| 51 | unset QMAKESPEC || true | 51 | unset QMAKESPEC || true |
| 52 | qmake -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling qmake on $PROFILES" | 52 | ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | EXPORT_FUNCTIONS do_configure | 55 | EXPORT_FUNCTIONS do_configure |
