From c0ac4d0673a25d52ad7d315b6e96f75bbe8be14c Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Tue, 13 Nov 2018 15:15:25 +0100
Subject: Fix running thumb vs arm instruction set on yocto

On yocto CC/CXX export contains flags like -marm, -mthumb
see https://lists.yoctoproject.org/pipermail/poky/2018-September/011497.html

Fix builds for webengine and check also QMAKE_CC for flags,
otherwise build ends up passing -marm and -mthumb flags
at the same time.

Change-Id: I76feb0eaf3bed8a6c3552db1bbf1a0809f03110a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 mkspecs/features/functions.prf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
index c9bd65b03..f433de3b2 100644
--- a/mkspecs/features/functions.prf
+++ b/mkspecs/features/functions.prf
@@ -14,7 +14,9 @@ defineReplace(extractCFlag) {
     CFLAGS = $$QMAKE_CC $$QMAKE_CFLAGS
     OPTION = $$find(CFLAGS, $$1)
     OPTION = $$split(OPTION, =)
-    return ($$member(OPTION, 1))
+    PARAM = $$member(OPTION, 1)
+    !isEmpty(PARAM): return ($$PARAM)
+    return ($$OPTION)
 }
 
 defineReplace(which) {
-- 
cgit v1.2.3