diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-06 13:10:39 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-09 13:56:49 +0200 |
| commit | 1c29e5de8d402eb4a9d57c6104a33798f5004f68 (patch) | |
| tree | ca38715a0bf33cd264898cf7632c8c07fcaaf53e /recipes-qt | |
| parent | c46260790ea5465cd2b371ac09b2b24912ae0cf3 (diff) | |
qt5: drop 'unset LD', qmake should now handle QMAKE_LINK correctly
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtjsbackend-native.inc | 3 |
4 files changed, 0 insertions, 12 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 2feeed62..e752ed6e 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 6791c7f1..bb4ab986 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 80199a26..64de60bb 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 57f017da..3db01350 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} } |