summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
index 0171a5dd..eeb3f640 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -1,4 +1,4 @@
1From e590e511b89a08867a801cb20e4e98787cb36e78 Mon Sep 17 00:00:00 2001 1From dd5033e3b9a425b3435629d9e8901b8445119fdb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Feb 2019 19:28:59 -0800 3Date: Sat, 2 Feb 2019 19:28:59 -0800
4Subject: [PATCH] chromium: fix build with clang 4Subject: [PATCH] chromium: fix build with clang
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 2 insertions(+), 25 deletions(-) 10 1 file changed, 2 insertions(+), 25 deletions(-)
11 11
12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
13index ab47e2b98f8..f5ac335af90 100644 13index fdfcf65f5ab..13d71d04030 100644
14--- a/chromium/build/config/compiler/BUILD.gn 14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn 15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -774,8 +774,6 @@ config("compiler_cpu_abi") { 16@@ -779,8 +779,6 @@ config("compiler_cpu_abi") {
17 } 17 }
18 } else if (current_cpu == "arm") { 18 } else if (current_cpu == "arm") {
19 if (is_clang && !is_android && !is_nacl) { 19 if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index ab47e2b98f8..f5ac335af90 100644
22 } 22 }
23 if (!is_nacl) { 23 if (!is_nacl) {
24 cflags += [ 24 cflags += [
25@@ -788,8 +786,6 @@ config("compiler_cpu_abi") { 25@@ -793,8 +791,6 @@ config("compiler_cpu_abi") {
26 } 26 }
27 } else if (current_cpu == "arm64") { 27 } else if (current_cpu == "arm64") {
28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index ab47e2b98f8..f5ac335af90 100644
31 } 31 }
32 } else if (current_cpu == "mipsel" && !is_nacl) { 32 } else if (current_cpu == "mipsel" && !is_nacl) {
33 ldflags += [ "-Wl,--hash-style=sysv" ] 33 ldflags += [ "-Wl,--hash-style=sysv" ]
34@@ -798,9 +794,6 @@ config("compiler_cpu_abi") { 34@@ -803,9 +799,6 @@ config("compiler_cpu_abi") {
35 if (is_android) { 35 if (is_android) {
36 cflags += [ "--target=mipsel-linux-android" ] 36 cflags += [ "--target=mipsel-linux-android" ]
37 ldflags += [ "--target=mipsel-linux-android" ] 37 ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index ab47e2b98f8..f5ac335af90 100644
41 } 41 }
42 } else { 42 } else {
43 cflags += [ "-EL" ] 43 cflags += [ "-EL" ]
44@@ -879,10 +872,7 @@ config("compiler_cpu_abi") { 44@@ -884,10 +877,7 @@ config("compiler_cpu_abi") {
45 } else if (current_cpu == "mips" && !is_nacl) { 45 } else if (current_cpu == "mips" && !is_nacl) {
46 ldflags += [ "-Wl,--hash-style=sysv" ] 46 ldflags += [ "-Wl,--hash-style=sysv" ]
47 if (custom_toolchain == "") { 47 if (custom_toolchain == "") {
@@ -53,7 +53,7 @@ index ab47e2b98f8..f5ac335af90 100644
53 cflags += [ "-EB" ] 53 cflags += [ "-EB" ]
54 ldflags += [ "-EB" ] 54 ldflags += [ "-EB" ]
55 } 55 }
56@@ -929,9 +919,6 @@ config("compiler_cpu_abi") { 56@@ -934,9 +924,6 @@ config("compiler_cpu_abi") {
57 if (is_android) { 57 if (is_android) {
58 cflags += [ "--target=mips64el-linux-android" ] 58 cflags += [ "--target=mips64el-linux-android" ]
59 ldflags += [ "--target=mips64el-linux-android" ] 59 ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index ab47e2b98f8..f5ac335af90 100644
63 } 63 }
64 } else { 64 } else {
65 cflags += [ 65 cflags += [
66@@ -988,10 +975,7 @@ config("compiler_cpu_abi") { 66@@ -993,10 +980,7 @@ config("compiler_cpu_abi") {
67 } else if (current_cpu == "mips64") { 67 } else if (current_cpu == "mips64") {
68 ldflags += [ "-Wl,--hash-style=sysv" ] 68 ldflags += [ "-Wl,--hash-style=sysv" ]
69 if (custom_toolchain == "") { 69 if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index ab47e2b98f8..f5ac335af90 100644
75 cflags += [ 75 cflags += [
76 "-EB", 76 "-EB",
77 "-mabi=64", 77 "-mabi=64",
78@@ -1160,13 +1144,6 @@ config("compiler_deterministic") { 78@@ -1165,13 +1149,6 @@ config("compiler_deterministic") {
79 } 79 }
80 } 80 }
81 } 81 }
@@ -83,7 +83,7 @@ index ab47e2b98f8..f5ac335af90 100644
83- # Tells the compiler not to use absolute paths when passing the default 83- # Tells the compiler not to use absolute paths when passing the default
84- # paths to the tools it invokes. We don't want this because we don't 84- # paths to the tools it invokes. We don't want this because we don't
85- # really need it and it can mess up the goma cache entries. 85- # really need it and it can mess up the goma cache entries.
86- if (is_clang && !is_nacl) { 86- if (is_clang && !is_nacl && !(use_qt && use_libcxx)) {
87- cflags += [ "-no-canonical-prefixes" ] 87- cflags += [ "-no-canonical-prefixes" ]
88- } 88- }
89 } 89 }