diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-19 15:27:44 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-21 15:31:15 +0000 |
commit | ed327d9cd97c0996e0875b0c03f86cbd76232977 (patch) | |
tree | 1b1b89d8617badc2e4a9b35af4d3472613b06a12 /recipes-qt/qt5/qtwebengine/chromium | |
parent | 282f531e63961300be055665acc454356de889fa (diff) | |
download | meta-qt5-ed327d9cd97c0996e0875b0c03f86cbd76232977.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.13 branch
Task-number: QTBUG-72311
Change-Id: If99527ca97867b99d5273e229d7e98a6cd149f5e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch deleted file mode 100644 index d914a862..00000000 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From f430c2c9b3d38f9150588da6dc154aa2285584e6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | ||
4 | Subject: [PATCH] chromium: Force host toolchain configuration | ||
5 | |||
6 | Force gcc/g++ to be used for parts using host toolchain, since | ||
7 | the option(host_build) does not work in yocto builds. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | ||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | gn/build/gen.py | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/gn/build/gen.py b/gn/build/gen.py | ||
17 | index 87db4c26bcf..34c853b7f4a 100755 | ||
18 | --- a/gn/build/gen.py | ||
19 | +++ b/gn/build/gen.py | ||
20 | @@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): | ||
21 | ld = os.environ.get('LD', 'g++') | ||
22 | ar = os.environ.get('AR', 'ar -X64') | ||
23 | else: | ||
24 | - cc = os.environ.get('CC', 'cc') | ||
25 | - cxx = os.environ.get('CXX', 'c++') | ||
26 | + cc = os.environ.get('CC_host', 'gcc') | ||
27 | + cxx = os.environ.get('CXX_host', 'g++') | ||
28 | ld = cxx | ||
29 | - ar = os.environ.get('AR', 'ar') | ||
30 | + ar = os.environ.get('AR_host', 'ar') | ||
31 | |||
32 | # QTBUG-64759 | ||
33 | # cflags = os.environ.get('CFLAGS', '').split() | ||