diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-09 10:11:02 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-09 16:54:03 +0200 |
| commit | 48138bfb2735e0e07065397d3c93516d202c3104 (patch) | |
| tree | 09bc3634c4c657c4c5e1bf45c86c94e164684ca5 /classes/qmake5_base.bbclass | |
| parent | 94b2064593e565ceaefdd7ef32506a99b0e6792b (diff) | |
| download | meta-qt5-48138bfb2735e0e07065397d3c93516d202c3104.tar.gz | |
qtbase: use EXTRA_OEMAKE also in config.tests executed in do_configure
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes/qmake5_base.bbclass')
| -rw-r--r-- | classes/qmake5_base.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 37037706..d81d283c 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
| @@ -172,8 +172,11 @@ qmake5_base_do_configure () { | |||
| 172 | bbnote "qmake prevar substitution: '${EXTRA_QMAKEVARS_PRE}'" | 172 | bbnote "qmake prevar substitution: '${EXTRA_QMAKEVARS_PRE}'" |
| 173 | fi | 173 | fi |
| 174 | 174 | ||
| 175 | # for config.tests to read this | ||
| 176 | export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" | ||
| 177 | |||
| 175 | CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST" | 178 | CMD="${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST" |
| 176 | $CMD || die "Error calling $CMD" | 179 | ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} -r $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling $CMD" |
| 177 | } | 180 | } |
| 178 | 181 | ||
| 179 | qmake5_base_do_install() { | 182 | qmake5_base_do_install() { |
