summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-11-22 15:52:52 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-11-23 18:21:34 +0200
commitfd86202d56c542011d24dc518457631bc00901c9 (patch)
treee495d6371c928c9c7dd95af50bf81d6608e9163b /recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
parentdc302eae5414f6bbf7c79234ed285fac572f4cdc (diff)
downloadmeta-qt5-fd86202d56c542011d24dc518457631bc00901c9.tar.gz
qtwebengine: add clang fix
Incorrectly removed previously, added back after rebasing it and the next patch touching the same file. Change-Id: I6f588b92e9356eec48f8dab88eee65cf84cce3c2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
index 5f7901e8..61d01fef 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
@@ -1,4 +1,4 @@
1From f49c5d488951027f1577f79681d448c3f30f6ae3 Mon Sep 17 00:00:00 2001 1From e7fa0c8b3c0a0a2d80180b032b1c73593e496f82 Mon Sep 17 00:00:00 2001
2From: Johannes Pointner <johannes.pointner@br-automation.com> 2From: Johannes Pointner <johannes.pointner@br-automation.com>
3Date: Fri, 3 May 2019 09:12:38 +0200 3Date: Fri, 3 May 2019 09:12:38 +0200
4Subject: [PATCH] chromium: Do not try to set the guessed values for 4Subject: [PATCH] chromium: Do not try to set the guessed values for
@@ -17,12 +17,12 @@ Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
17 1 file changed, 9 deletions(-) 17 1 file changed, 9 deletions(-)
18 18
19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 19diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
20index 127d0c444bd..b653e933d6f 100644 20index 7179df05451..884c9714bbb 100644
21--- a/chromium/build/config/compiler/BUILD.gn 21--- a/chromium/build/config/compiler/BUILD.gn
22+++ b/chromium/build/config/compiler/BUILD.gn 22+++ b/chromium/build/config/compiler/BUILD.gn
23@@ -749,15 +749,6 @@ config("compiler_cpu_abi") { 23@@ -774,15 +774,6 @@ config("compiler_cpu_abi") {
24 cflags += [ "--target=arm-linux-gnueabihf" ] 24 } else if (current_cpu == "arm") {
25 ldflags += [ "--target=arm-linux-gnueabihf" ] 25 if (is_clang && !is_android && !is_nacl) {
26 } 26 }
27- if (!is_nacl) { 27- if (!is_nacl) {
28- cflags += [ 28- cflags += [
@@ -35,4 +35,4 @@ index 127d0c444bd..b653e933d6f 100644
35- } 35- }
36 } else if (current_cpu == "arm64") { 36 } else if (current_cpu == "arm64") {
37 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 37 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
38 cflags += [ "--target=aarch64-linux-gnu" ] 38 }