diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-06-06 08:25:33 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-06-06 11:32:55 +0000 |
commit | 33f58ffa657c3ae924f86a65be117be3562b2bf3 (patch) | |
tree | 6b71aa37166b5a7e184a33b89f32d666d9dd99fb /recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch | |
parent | 267a38fddeecb28b269fc86f7024e50dbc47acbe (diff) | |
download | meta-qt5-33f58ffa657c3ae924f86a65be117be3562b2bf3.tar.gz |
qtwebengine: fix build with gcc8, part II
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch | 33 |
1 files changed, 33 insertions, 0 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 new file mode 100644 index 00000000..6de64b03 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From e3b98ab1d2e08c0072bd83dd7f487f404cc3a44a 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 | chromium/tools/gn/bootstrap/bootstrap.py | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py | ||
17 | index 93c6446f28..0fe7e6737d 100755 | ||
18 | --- a/chromium/tools/gn/bootstrap/bootstrap.py | ||
19 | +++ b/chromium/tools/gn/bootstrap/bootstrap.py | ||
20 | @@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options): | ||
21 | ld = os.environ.get('LD', cxx) | ||
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() | ||