summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2014-02-18 00:01:28 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-19 11:56:33 +0100
commit0d9f550f68f27ebbdf8856693b1078bbb3049849 (patch)
tree4696b2f31989683ed0a1f15adbc2f00ab18237e2
parentdc0073bb4586077ec1cc5204cca9029c656997b4 (diff)
downloadmeta-qt5-0d9f550f68f27ebbdf8856693b1078bbb3049849.tar.gz
qtbase.inc: don't force ARM_INSTRUCTION_SET to arm
Forcing ARM_INSTRUCTION_SET to arm when building qtbase no longer seems to be required. Confirmed by forcing ARM_INSTRUCTION_SET to thumb and building qtbase 5.1.1 and 5.2.1 tuned for both armv4t and cortexa9thf-neon. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtbase.inc3
1 files changed, 0 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index d61d2dbf..4c1c6dda 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -127,9 +127,6 @@ QT_CONFIG_FLAGS += " \
127 ${EXTRA_OECONF} \ 127 ${EXTRA_OECONF} \
128" 128"
129 129
130# Qt uses atomic instructions not supported in thumb mode
131ARM_INSTRUCTION_SET = "arm"
132
133do_generate_qt_config_file_append() { 130do_generate_qt_config_file_append() {
134 cat >> ${QT_CONF_PATH} <<EOF 131 cat >> ${QT_CONF_PATH} <<EOF
135 132