diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch index 3305c6b4..7823482b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch | |||
@@ -6,15 +6,15 @@ Subject: [PATCH] chromium: fix build with clang | |||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | --- | 8 | --- |
9 | chromium/build/config/compiler/BUILD.gn | 27 ++----------------------- | 9 | chromium/build/config/compiler/BUILD.gn | 27 ++------------------------- |
10 | 1 file changed, 2 insertions(+), 25 deletions(-) | 10 | 1 file changed, 2 insertions(+), 25 deletions(-) |
11 | 11 | ||
12 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn | 12 | diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn |
13 | index d223a4f6fd4..1c42c49ea4a 100644 | 13 | index d223a4f6fd4..1c42c49ea4a 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 | @@ -544,13 +544,6 @@ config("compiler") { | 16 | @@ -561,13 +561,6 @@ config("compiler") { |
17 | ] | 17 | } |
18 | } | 18 | } |
19 | 19 | ||
20 | - # Tells the compiler not to use absolute paths when passing the default | 20 | - # Tells the compiler not to use absolute paths when passing the default |
@@ -27,7 +27,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
27 | # C11/C++11 compiler flags setup. | 27 | # C11/C++11 compiler flags setup. |
28 | # --------------------------- | 28 | # --------------------------- |
29 | if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { | 29 | if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { |
30 | @@ -748,8 +741,6 @@ config("compiler_cpu_abi") { | 30 | @@ -799,8 +792,6 @@ config("compiler_cpu_abi") { |
31 | } | 31 | } |
32 | } else if (current_cpu == "arm") { | 32 | } else if (current_cpu == "arm") { |
33 | if (is_clang && !is_android && !is_nacl) { | 33 | if (is_clang && !is_android && !is_nacl) { |
@@ -36,7 +36,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
36 | } | 36 | } |
37 | if (!is_nacl) { | 37 | if (!is_nacl) { |
38 | cflags += [ | 38 | cflags += [ |
39 | @@ -762,8 +753,6 @@ config("compiler_cpu_abi") { | 39 | @@ -813,8 +804,6 @@ config("compiler_cpu_abi") { |
40 | } | 40 | } |
41 | } else if (current_cpu == "arm64") { | 41 | } else if (current_cpu == "arm64") { |
42 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | 42 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { |
@@ -45,7 +45,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
45 | } | 45 | } |
46 | } else if (current_cpu == "mipsel" && !is_nacl) { | 46 | } else if (current_cpu == "mipsel" && !is_nacl) { |
47 | ldflags += [ "-Wl,--hash-style=sysv" ] | 47 | ldflags += [ "-Wl,--hash-style=sysv" ] |
48 | @@ -772,9 +761,6 @@ config("compiler_cpu_abi") { | 48 | @@ -823,9 +812,6 @@ config("compiler_cpu_abi") { |
49 | if (is_android) { | 49 | if (is_android) { |
50 | cflags += [ "--target=mipsel-linux-android" ] | 50 | cflags += [ "--target=mipsel-linux-android" ] |
51 | ldflags += [ "--target=mipsel-linux-android" ] | 51 | ldflags += [ "--target=mipsel-linux-android" ] |
@@ -55,7 +55,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
55 | } | 55 | } |
56 | } else { | 56 | } else { |
57 | cflags += [ "-EL" ] | 57 | cflags += [ "-EL" ] |
58 | @@ -853,10 +839,7 @@ config("compiler_cpu_abi") { | 58 | @@ -904,10 +890,7 @@ config("compiler_cpu_abi") { |
59 | } else if (current_cpu == "mips" && !is_nacl) { | 59 | } else if (current_cpu == "mips" && !is_nacl) { |
60 | ldflags += [ "-Wl,--hash-style=sysv" ] | 60 | ldflags += [ "-Wl,--hash-style=sysv" ] |
61 | if (custom_toolchain == "") { | 61 | if (custom_toolchain == "") { |
@@ -67,7 +67,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
67 | cflags += [ "-EB" ] | 67 | cflags += [ "-EB" ] |
68 | ldflags += [ "-EB" ] | 68 | ldflags += [ "-EB" ] |
69 | } | 69 | } |
70 | @@ -902,9 +885,6 @@ config("compiler_cpu_abi") { | 70 | @@ -954,9 +937,6 @@ config("compiler_cpu_abi") { |
71 | if (is_android) { | 71 | if (is_android) { |
72 | cflags += [ "--target=mips64el-linux-android" ] | 72 | cflags += [ "--target=mips64el-linux-android" ] |
73 | ldflags += [ "--target=mips64el-linux-android" ] | 73 | ldflags += [ "--target=mips64el-linux-android" ] |
@@ -77,7 +77,7 @@ index d223a4f6fd4..1c42c49ea4a 100644 | |||
77 | } | 77 | } |
78 | } else { | 78 | } else { |
79 | cflags += [ | 79 | cflags += [ |
80 | @@ -961,10 +941,7 @@ config("compiler_cpu_abi") { | 80 | @@ -1013,10 +993,7 @@ config("compiler_cpu_abi") { |
81 | } else if (current_cpu == "mips64") { | 81 | } else if (current_cpu == "mips64") { |
82 | ldflags += [ "-Wl,--hash-style=sysv" ] | 82 | ldflags += [ "-Wl,--hash-style=sysv" ] |
83 | if (custom_toolchain == "") { | 83 | if (custom_toolchain == "") { |