diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch new file mode 100644 index 00000000..75dad974 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch | |||
@@ -0,0 +1,91 @@ | |||
1 | From 35cd9c8391865012644038b1af425ac7e2ae1828 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 2 Feb 2019 19:28:59 -0800 | ||
4 | Subject: [PATCH] chromium: fix build with clang | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | chromium/build/config/compiler/BUILD.gn | 27 ++----------------------- | ||
10 | 1 file changed, 2 insertions(+), 25 deletions(-) | ||
11 | |||
12 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | ||
13 | index 6a58d21cf07..c007eab8ec9 100644 | ||
14 | --- a/chromium/build/config/compiler/BUILD.gn | ||
15 | +++ b/chromium/build/config/compiler/BUILD.gn | ||
16 | @@ -782,8 +782,6 @@ config("compiler_cpu_abi") { | ||
17 | } | ||
18 | } else if (current_cpu == "arm") { | ||
19 | if (is_clang && !is_android && !is_nacl) { | ||
20 | - cflags += [ "--target=arm-linux-gnueabihf" ] | ||
21 | - ldflags += [ "--target=arm-linux-gnueabihf" ] | ||
22 | } | ||
23 | if (!is_nacl) { | ||
24 | cflags += [ | ||
25 | @@ -796,8 +794,6 @@ config("compiler_cpu_abi") { | ||
26 | } | ||
27 | } else if (current_cpu == "arm64") { | ||
28 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | ||
29 | - cflags += [ "--target=aarch64-linux-gnu" ] | ||
30 | - ldflags += [ "--target=aarch64-linux-gnu" ] | ||
31 | } | ||
32 | } else if (current_cpu == "mipsel" && !is_nacl) { | ||
33 | ldflags += [ "-Wl,--hash-style=sysv" ] | ||
34 | @@ -806,9 +802,6 @@ config("compiler_cpu_abi") { | ||
35 | if (is_android) { | ||
36 | cflags += [ "--target=mipsel-linux-android" ] | ||
37 | ldflags += [ "--target=mipsel-linux-android" ] | ||
38 | - } else { | ||
39 | - cflags += [ "--target=mipsel-linux-gnu" ] | ||
40 | - ldflags += [ "--target=mipsel-linux-gnu" ] | ||
41 | } | ||
42 | } else { | ||
43 | cflags += [ "-EL" ] | ||
44 | @@ -887,10 +880,7 @@ config("compiler_cpu_abi") { | ||
45 | } else if (current_cpu == "mips" && !is_nacl) { | ||
46 | ldflags += [ "-Wl,--hash-style=sysv" ] | ||
47 | if (custom_toolchain == "") { | ||
48 | - if (is_clang) { | ||
49 | - cflags += [ "--target=mips-linux-gnu" ] | ||
50 | - ldflags += [ "--target=mips-linux-gnu" ] | ||
51 | - } else { | ||
52 | + if (!is_clang) { | ||
53 | cflags += [ "-EB" ] | ||
54 | ldflags += [ "-EB" ] | ||
55 | } | ||
56 | @@ -937,9 +927,6 @@ config("compiler_cpu_abi") { | ||
57 | if (is_android) { | ||
58 | cflags += [ "--target=mips64el-linux-android" ] | ||
59 | ldflags += [ "--target=mips64el-linux-android" ] | ||
60 | - } else { | ||
61 | - cflags += [ "--target=mips64el-linux-gnuabi64" ] | ||
62 | - ldflags += [ "--target=mips64el-linux-gnuabi64" ] | ||
63 | } | ||
64 | } else { | ||
65 | cflags += [ | ||
66 | @@ -996,10 +983,7 @@ config("compiler_cpu_abi") { | ||
67 | } else if (current_cpu == "mips64") { | ||
68 | ldflags += [ "-Wl,--hash-style=sysv" ] | ||
69 | if (custom_toolchain == "") { | ||
70 | - if (is_clang) { | ||
71 | - cflags += [ "--target=mips64-linux-gnuabi64" ] | ||
72 | - ldflags += [ "--target=mips64-linux-gnuabi64" ] | ||
73 | - } else { | ||
74 | + if (!is_clang) { | ||
75 | cflags += [ | ||
76 | "-EB", | ||
77 | "-mabi=64", | ||
78 | @@ -1166,13 +1150,6 @@ config("compiler_deterministic") { | ||
79 | } | ||
80 | } | ||
81 | } | ||
82 | - | ||
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 | ||
85 | - # really need it and it can mess up the goma cache entries. | ||
86 | - if (is_clang && !is_nacl && !(use_qt && use_libcxx)) { | ||
87 | - cflags += [ "-no-canonical-prefixes" ] | ||
88 | - } | ||
89 | } | ||
90 | |||
91 | config("clang_revision") { | ||