summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
diff options
context:
space:
mode:
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.patch16
1 files changed, 6 insertions, 10 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 b51c4c72..c9266582 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -17,8 +17,6 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
17 src/core/config/linux.pri | 2 +- 17 src/core/config/linux.pri | 2 +-
18 2 files changed, 8 insertions(+), 8 deletions(-) 18 2 files changed, 8 insertions(+), 8 deletions(-)
19 19
20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
21index dd0d3e32..70161c82 100644
22--- a/src/buildtools/configure_host.pro 20--- a/src/buildtools/configure_host.pro
23+++ b/src/buildtools/configure_host.pro 21+++ b/src/buildtools/configure_host.pro
24@@ -4,7 +4,7 @@ TEMPLATE = aux 22@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -37,9 +35,9 @@ index dd0d3e32..70161c82 100644
37-" cc = \"$$which($$QMAKE_CC)\" " \ 35-" cc = \"$$which($$QMAKE_CC)\" " \
38-" cxx = \"$$which($$QMAKE_CXX)\" " \ 36-" cxx = \"$$which($$QMAKE_CXX)\" " \
39-" ld = \"$$which($$QMAKE_LINK)\" " \ 37-" ld = \"$$which($$QMAKE_LINK)\" " \
40+" cc = \"$$which(gcc)\" " \ 38+" cc = \"$$which($$CC_host)\" " \
41+" cxx = \"$$which(g++)\" " \ 39+" cxx = \"$$which($$CXX_host)\" " \
42+" ld = \"$$which(g++)\" " \ 40+" ld = \"$$which($$CXX_host)\" " \
43 " ar = \"$$which(ar)\" " \ 41 " ar = \"$$which(ar)\" " \
44 " nm = \"$$which(nm)\" " \ 42 " nm = \"$$which(nm)\" " \
45 " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ 43 " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \
@@ -50,14 +48,12 @@ index dd0d3e32..70161c82 100644
50-" cc = \"$$which($$QMAKE_CC)\" " \ 48-" cc = \"$$which($$QMAKE_CC)\" " \
51-" cxx = \"$$which($$QMAKE_CXX)\" " \ 49-" cxx = \"$$which($$QMAKE_CXX)\" " \
52-" ld = \"$$which($$QMAKE_LINK)\" " \ 50-" ld = \"$$which($$QMAKE_LINK)\" " \
53+" cc = \"$$which(gcc)\" " \ 51+" cc = \"$$which($$CC_host)\" " \
54+" cxx = \"$$which(g++)\" " \ 52+" cxx = \"$$which($$CXX_host)\" " \
55+" ld = \"$$which(g++)\" " \ 53+" ld = \"$$which($$CXX_host)\" " \
56 " ar = \"$$which(ar)\" " \ 54 " ar = \"$$which(ar)\" " \
57 " nm = \"$$which(nm)\" " \ 55 " nm = \"$$which(nm)\" " \
58 " toolchain_args = { " \ 56 " toolchain_args = { " \
59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
60index 85b948db..c529c641 100644
61--- a/src/core/config/linux.pri 57--- a/src/core/config/linux.pri
62+++ b/src/core/config/linux.pri 58+++ b/src/core/config/linux.pri
63@@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") { 59@@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") {