diff options
-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() { | |||
18 | set_arch | 18 | set_arch |
19 | set_endian | 19 | set_endian |
20 | 20 | ||
21 | # Avoid problems with the linkers, since we want the linker to be g++ | ||
22 | unset LD | ||
23 | |||
24 | # Similar logic is in autotools.bbclass | 21 | # Similar logic is in autotools.bbclass |
25 | if [ -d ${B} -a "${S}" != "${B}" ] ; then | 22 | if [ -d ${B} -a "${S}" != "${B}" ] ; then |
26 | # Existing separate build directory, exists, remove | 23 | # 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() { | |||
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 | } |
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() { | |||
94 | set_arch | 94 | set_arch |
95 | set_endian | 95 | set_endian |
96 | 96 | ||
97 | # Avoid problems with the linkers, since we want the linker to be g++ | ||
98 | unset LD | ||
99 | |||
100 | # Similar logic is in autotools.bbclass | 97 | # Similar logic is in autotools.bbclass |
101 | if [ -d ${B} -a "${S}" != "${B}" ] ; then | 98 | if [ -d ${B} -a "${S}" != "${B}" ] ; then |
102 | # Existing separate build directory, exists, remove | 99 | # 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() { | |||
27 | rm -rf "${B}/*" | 27 | rm -rf "${B}/*" |
28 | fi | 28 | fi |
29 | 29 | ||
30 | # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++) | ||
31 | unset LD | ||
32 | |||
33 | ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} | 30 | ${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} |
34 | } | 31 | } |
35 | 32 | ||