summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-05-05 20:34:26 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-05-23 07:06:25 +0000
commit5bbb8d27ca10c38300bfc0c31c68470eb32b7711 (patch)
treecf91d64b33bd3a76f1bb7620accca0f598c88e81 /recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
parente26163d066a867ca8f630f7caffff207ef26b4a7 (diff)
downloadmeta-qt5-5bbb8d27ca10c38300bfc0c31c68470eb32b7711.tar.gz
qt5: update submodulesv5.13.0-beta4
Update to Qt 5.13.0 beta4 Task-number: QTBUG-72311 Change-Id: Ia25415c4fb796bbc7335ae468030be4634ca4085 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index bef8ad6d..9e3eeed0 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From bf92c8a03189d7a559aff7d62c2d9fc6047d2659 Mon Sep 17 00:00:00 2001 1From a35a1ee7e93610d049da6eb0931f69f2647a93dc Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
19 3 files changed, 10 insertions(+), 10 deletions(-) 19 3 files changed, 10 insertions(+), 10 deletions(-)
20 20
21diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 21diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
22index dd0d3e32..70161c82 100644 22index dd0d3e3..70161c8 100644
23--- a/src/buildtools/configure_host.pro 23--- a/src/buildtools/configure_host.pro
24+++ b/src/buildtools/configure_host.pro 24+++ b/src/buildtools/configure_host.pro
25@@ -4,7 +4,7 @@ TEMPLATE = aux 25@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -58,25 +58,25 @@ index dd0d3e32..70161c82 100644
58 " nm = \"$$which(nm)\" " \ 58 " nm = \"$$which(nm)\" " \
59 " toolchain_args = { " \ 59 " toolchain_args = { " \
60diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro 60diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
61index 30ada93..afd115c 100644 61index b6bf9cf..ae419b1 100644
62--- a/src/buildtools/gn.pro 62--- a/src/buildtools/gn.pro
63+++ b/src/buildtools/gn.pro 63+++ b/src/buildtools/gn.pro
64@@ -19,8 +19,8 @@ build_pass|!debug_and_release { 64@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
65 gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) 65 gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
66 66
67 gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ 67 gn_gen_args = --no-last-commit-position --out-path $$out_path \
68- --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ 68- --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
69- --ld \"$$which($$QMAKE_LINK)\" 69- --ld \"$$which($$QMAKE_LINK)\"
70+ --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ 70+ --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \
71+ --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" 71+ --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\"
72 macos { 72
73 gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" 73 msvc:!clang_cl: gn_gen_args += --use-lto
74 } 74
75diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri 75diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
76index 04c9eca..c48fa06 100644 76index 95b7a4b..db0658e 100644
77--- a/src/core/config/linux.pri 77--- a/src/core/config/linux.pri
78+++ b/src/core/config/linux.pri 78+++ b/src/core/config/linux.pri
79@@ -115,7 +115,7 @@ contains(QT_ARCH, "mips") { 79@@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") {
80 80
81 host_build { 81 host_build {
82 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" 82 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"