diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-28 08:05:45 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-01 14:09:18 +0000 |
| commit | 40cdc96243c4bae26789ba1c9373348a799607d9 (patch) | |
| tree | 70acf25130a4b86338160d3aff19efc674ea9096 /recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch | |
| parent | a34f936566039c2cba6a0e58192398255a0653b8 (diff) | |
| download | meta-qt5-40cdc96243c4bae26789ba1c9373348a799607d9.tar.gz | |
qt5: update submodules
Update to latest 5.12.0 snapshot
Change-Id: I5c0c78ffa069edf3a7103bb9bf7f576c14581e4f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
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 | 16 |
1 files changed, 8 insertions, 8 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 index 32efcf99..941aab1b 100644 --- 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 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 761754d5edf129d526e87ed5ace71d24f30e9618 Mon Sep 17 00:00:00 2001 | 1 | From b462e56f5254956d582cf6d74c0525d588dd3c07 Mon Sep 17 00:00:00 2001 |
| 2 | From: Samuli Piippo <samuli.piippo@qt.io> | 2 | From: Samuli Piippo <samuli.piippo@qt.io> |
| 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 | 3 | Date: Wed, 15 Mar 2017 13:53:28 +0200 |
| 4 | Subject: [PATCH] chromium: Force host toolchain configuration | 4 | Subject: [PATCH] chromium: Force host toolchain configuration |
| @@ -10,15 +10,15 @@ Upstream-Status: Inappropriate [OE specific] | |||
| 10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> | 10 | Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> |
| 11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 12 | --- | 12 | --- |
| 13 | chromium/tools/gn/bootstrap/bootstrap.py | 6 +++--- | 13 | gn/build/gen.py | 6 +++--- |
| 14 | 1 file changed, 3 insertions(+), 3 deletions(-) | 14 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 15 | 15 | ||
| 16 | diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py | 16 | diff --git a/gn/build/gen.py b/gn/build/gen.py |
| 17 | index 93c6446f28..0fe7e6737d 100755 | 17 | index b677954..698b4e5 100755 |
| 18 | --- a/chromium/tools/gn/bootstrap/bootstrap.py | 18 | --- a/gn/build/gen.py |
| 19 | +++ b/chromium/tools/gn/bootstrap/bootstrap.py | 19 | +++ b/gn/build/gen.py |
| 20 | @@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options): | 20 | @@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): |
| 21 | ld = os.environ.get('LD', cxx) | 21 | ld = os.environ.get('LD', 'g++') |
| 22 | ar = os.environ.get('AR', 'ar -X64') | 22 | ar = os.environ.get('AR', 'ar -X64') |
| 23 | else: | 23 | else: |
| 24 | - cc = os.environ.get('CC', 'cc') | 24 | - cc = os.environ.get('CC', 'cc') |