diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-17 21:59:04 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 13:39:32 +0200 |
| commit | 40436b7fc9f0d699071191ca06ea70b1f2ee82e4 (patch) | |
| tree | 4880a3717bfdca6f2820de16d6a67afbcde61606 | |
| parent | 861b62f51e6756ae7f3c2b0a6ce852e8a621fa6c (diff) | |
| download | meta-qt5-40436b7fc9f0d699071191ca06ea70b1f2ee82e4.tar.gz | |
qmake5_base: don't push AR to EXTRA_ENV
* it overwrites value set from shell env in qmake.conf and ar is loosing cqs params
mkspecs/linux-oe-g++/qmake.conf:QMAKE_AR = $(OE_QMAKE_AR) cqs
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | classes/qmake5_base.bbclass | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 3e757ab4..fdbb6cad 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
| @@ -13,7 +13,6 @@ EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" | |||
| 13 | EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ | 13 | EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ |
| 14 | INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ | 14 | INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ |
| 15 | LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ | 15 | LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ |
| 16 | AR="${OE_QMAKE_AR}" \ | ||
| 17 | STRIP="${OE_QMAKE_STRIP}" \ | 16 | STRIP="${OE_QMAKE_STRIP}" \ |
| 18 | MAKE="make -e ${PARALLEL_MAKE}"' | 17 | MAKE="make -e ${PARALLEL_MAKE}"' |
| 19 | 18 | ||