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/qt5/qtbase-native.inc | |
| parent | c46260790ea5465cd2b371ac09b2b24912ae0cf3 (diff) | |
| download | meta-qt5-1c29e5de8d402eb4a9d57c6104a33798f5004f68.tar.gz | |
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/qt5/qtbase-native.inc')
| -rw-r--r-- | recipes-qt/qt5/qtbase-native.inc | 3 |
1 files changed, 0 insertions, 3 deletions
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() { | |||
| 81 | rm -rf "${B}/*" | 81 | rm -rf "${B}/*" |
| 82 | fi | 82 | fi |
| 83 | 83 | ||
| 84 | # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) | ||
| 85 | unset LD | ||
| 86 | |||
| 87 | (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" | 84 | (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" |
| 88 | bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" | 85 | bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}" |
| 89 | } | 86 | } |