qt5: drop 'unset LD', qmake should now handle QMAKE_LINK correctly
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
c46260790e
commit
1c29e5de8d
|
@ -18,9 +18,6 @@ do_configure() {
|
||||||
set_arch
|
set_arch
|
||||||
set_endian
|
set_endian
|
||||||
|
|
||||||
# Avoid problems with the linkers, since we want the linker to be g++
|
|
||||||
unset LD
|
|
||||||
|
|
||||||
# Similar logic is in autotools.bbclass
|
# Similar logic is in autotools.bbclass
|
||||||
if [ -d ${B} -a "${S}" != "${B}" ] ; then
|
if [ -d ${B} -a "${S}" != "${B}" ] ; then
|
||||||
# Existing separate build directory, exists, remove
|
# Existing separate build directory, exists, remove
|
||||||
|
|
|
@ -81,9 +81,6 @@ do_configure_prepend() {
|
||||||
rm -rf "${B}/*"
|
rm -rf "${B}/*"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
|
|
||||||
unset LD
|
|
||||||
|
|
||||||
(echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
|
(echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
|
||||||
bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}"
|
bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}"
|
||||||
}
|
}
|
||||||
|
|
|
@ -94,9 +94,6 @@ do_configure() {
|
||||||
set_arch
|
set_arch
|
||||||
set_endian
|
set_endian
|
||||||
|
|
||||||
# Avoid problems with the linkers, since we want the linker to be g++
|
|
||||||
unset LD
|
|
||||||
|
|
||||||
# Similar logic is in autotools.bbclass
|
# Similar logic is in autotools.bbclass
|
||||||
if [ -d ${B} -a "${S}" != "${B}" ] ; then
|
if [ -d ${B} -a "${S}" != "${B}" ] ; then
|
||||||
# Existing separate build directory, exists, remove
|
# Existing separate build directory, exists, remove
|
||||||
|
|
|
@ -27,9 +27,6 @@ do_configure() {
|
||||||
rm -rf "${B}/*"
|
rm -rf "${B}/*"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
|
|
||||||
unset LD
|
|
||||||
|
|
||||||
${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
|
${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue