diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-11-13 15:15:25 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-11-21 16:29:47 +0000 |
| commit | c0ac4d0673a25d52ad7d315b6e96f75bbe8be14c (patch) | |
| tree | 70c80da69fb6a82bed282b9851353bb975fa75ca /src/core/config/linux.pri | |
| parent | a5b82567f8f29885aa62044b920ab669f3726047 (diff) | |
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>
Diffstat (limited to 'src/core/config/linux.pri')
| -rw-r--r-- | src/core/config/linux.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index ed7745b89..0eea066e4 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -83,8 +83,10 @@ contains(QT_ARCH, "arm") { } } - if(isEmpty(MARMV)|lessThan(MARMV, 7)):contains(QMAKE_CFLAGS, "-marm"): gn_args += arm_use_thumb=false - else: contains(QMAKE_CFLAGS, "-mthumb"): gn_args += arm_use_thumb=true + MTHUMB = $$extractCFlag("-mthumb") + MARM = $$extractCFlag("-marm") + if (isEmpty(MARMV) | lessThan(MARMV, 7) | !isEmpty(MARM)): gn_args += arm_use_thumb=false + else: !isEmpty(MTHUMB): gn_args += arm_use_thumb=true } contains(QT_ARCH, "mips") { |