1 files changed, 19 insertions, 3 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 8de23c76..d15af51e 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -14,8 +14,9 @@ Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
 ---
  src/buildtools/configure_host.pro | 14 +++++++-------
+ src/buildtools/gn.pro             |  4 ++--
  src/core/config/linux.pri         |  2 +-
- 2 files changed, 8 insertions(+), 8 deletions(-)
+ 3 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
 index dd0d3e32..6312c867 100644
@@ -56,11 +57,26 @@ index dd0d3e32..6312c867 100644
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
+diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
+index b6bf9cf..ae419b1 100644
+--- a/src/buildtools/gn.pro
++++ b/src/buildtools/gn.pro
+@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
+             gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
+ 
+             gn_gen_args = --no-last-commit-position --out-path $$out_path \
+-                          --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
+-                          --ld \"$$which($$QMAKE_LINK)\"
++                          --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \
++                          --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\"
+ 
+             msvc:!clang_cl: gn_gen_args += --use-lto
+ 
 diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 9fc8c6e8..f3768585 100644
+index 95b7a4b..db0658e 100644
 --- a/src/core/config/linux.pri
 +++ b/src/core/config/linux.pri
-@@ -113,7 +113,7 @@ contains(QT_ARCH, "mips") {
+@@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") {
  
  host_build {
      gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"