diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 2feeed6214..e752ed6e21 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -18,9 +18,6 @@ do_configure() { set_arch set_endian - # Avoid problems with the linkers, since we want the linker to be g++ - unset LD - # Similar logic is in autotools.bbclass if [ -d ${B} -a "${S}" != "${B}" ] ; then # Existing separate build directory, exists, remove diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 6791c7f1ff..bb4ab98628 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -81,9 +81,6 @@ do_configure_prepend() { rm -rf "${B}/*" 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}" bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" } diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 80199a267e..64de60bb15 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -94,9 +94,6 @@ do_configure() { set_arch set_endian - # Avoid problems with the linkers, since we want the linker to be g++ - unset LD - # Similar logic is in autotools.bbclass if [ -d ${B} -a "${S}" != "${B}" ] ; then # Existing separate build directory, exists, remove diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 57f017dafe..3db013501e 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -27,9 +27,6 @@ do_configure() { rm -rf "${B}/*" 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} }