diff options
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.patch | 40 |
1 files changed, 20 insertions, 20 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 4730a6bd..278a9b0c 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 | |||
| @@ -13,21 +13,7 @@ diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/com | |||
| 13 | index 17f486447fe..06c93e5b3cf 100644 | 13 | index 17f486447fe..06c93e5b3cf 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 | @@ -570,13 +570,6 @@ config("compiler") { | 16 | @@ -773,8 +773,6 @@ config("compiler_cpu_abi") { |
| 17 | } | ||
| 18 | } | ||
| 19 | |||
| 20 | - # Tells the compiler not to use absolute paths when passing the default | ||
| 21 | - # paths to the tools it invokes. We don't want this because we don't | ||
| 22 | - # really need it and it can mess up the goma cache entries. | ||
| 23 | - if (is_clang && !is_nacl) { | ||
| 24 | - cflags += [ "-no-canonical-prefixes" ] | ||
| 25 | - } | ||
| 26 | - | ||
| 27 | # C11/C++11 compiler flags setup. | ||
| 28 | # --------------------------- | ||
| 29 | if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { | ||
| 30 | @@ -815,8 +808,6 @@ config("compiler_cpu_abi") { | ||
| 31 | } | 17 | } |
| 32 | } else if (current_cpu == "arm") { | 18 | } else if (current_cpu == "arm") { |
| 33 | if (is_clang && !is_android && !is_nacl) { | 19 | if (is_clang && !is_android && !is_nacl) { |
| @@ -36,7 +22,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
| 36 | } | 22 | } |
| 37 | if (!is_nacl) { | 23 | if (!is_nacl) { |
| 38 | cflags += [ | 24 | cflags += [ |
| 39 | @@ -829,8 +820,6 @@ config("compiler_cpu_abi") { | 25 | @@ -787,8 +785,6 @@ config("compiler_cpu_abi") { |
| 40 | } | 26 | } |
| 41 | } else if (current_cpu == "arm64") { | 27 | } else if (current_cpu == "arm64") { |
| 42 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { | 28 | if (is_clang && !is_android && !is_nacl && !is_fuchsia) { |
| @@ -45,7 +31,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
| 45 | } | 31 | } |
| 46 | } else if (current_cpu == "mipsel" && !is_nacl) { | 32 | } else if (current_cpu == "mipsel" && !is_nacl) { |
| 47 | ldflags += [ "-Wl,--hash-style=sysv" ] | 33 | ldflags += [ "-Wl,--hash-style=sysv" ] |
| 48 | @@ -839,9 +828,6 @@ config("compiler_cpu_abi") { | 34 | @@ -797,9 +793,6 @@ config("compiler_cpu_abi") { |
| 49 | if (is_android) { | 35 | if (is_android) { |
| 50 | cflags += [ "--target=mipsel-linux-android" ] | 36 | cflags += [ "--target=mipsel-linux-android" ] |
| 51 | ldflags += [ "--target=mipsel-linux-android" ] | 37 | ldflags += [ "--target=mipsel-linux-android" ] |
| @@ -55,7 +41,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
| 55 | } | 41 | } |
| 56 | } else { | 42 | } else { |
| 57 | cflags += [ "-EL" ] | 43 | cflags += [ "-EL" ] |
| 58 | @@ -920,10 +906,7 @@ config("compiler_cpu_abi") { | 44 | @@ -878,10 +871,7 @@ config("compiler_cpu_abi") { |
| 59 | } else if (current_cpu == "mips" && !is_nacl) { | 45 | } else if (current_cpu == "mips" && !is_nacl) { |
| 60 | ldflags += [ "-Wl,--hash-style=sysv" ] | 46 | ldflags += [ "-Wl,--hash-style=sysv" ] |
| 61 | if (custom_toolchain == "") { | 47 | if (custom_toolchain == "") { |
| @@ -67,7 +53,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
| 67 | cflags += [ "-EB" ] | 53 | cflags += [ "-EB" ] |
| 68 | ldflags += [ "-EB" ] | 54 | ldflags += [ "-EB" ] |
| 69 | } | 55 | } |
| 70 | @@ -970,9 +953,6 @@ config("compiler_cpu_abi") { | 56 | @@ -928,9 +918,6 @@ config("compiler_cpu_abi") { |
| 71 | if (is_android) { | 57 | if (is_android) { |
| 72 | cflags += [ "--target=mips64el-linux-android" ] | 58 | cflags += [ "--target=mips64el-linux-android" ] |
| 73 | ldflags += [ "--target=mips64el-linux-android" ] | 59 | ldflags += [ "--target=mips64el-linux-android" ] |
| @@ -77,7 +63,7 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
| 77 | } | 63 | } |
| 78 | } else { | 64 | } else { |
| 79 | cflags += [ | 65 | cflags += [ |
| 80 | @@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") { | 66 | @@ -987,10 +974,7 @@ config("compiler_cpu_abi") { |
| 81 | } else if (current_cpu == "mips64") { | 67 | } else if (current_cpu == "mips64") { |
| 82 | ldflags += [ "-Wl,--hash-style=sysv" ] | 68 | ldflags += [ "-Wl,--hash-style=sysv" ] |
| 83 | if (custom_toolchain == "") { | 69 | if (custom_toolchain == "") { |
| @@ -89,3 +75,17 @@ index 17f486447fe..06c93e5b3cf 100644 | |||
| 89 | cflags += [ | 75 | cflags += [ |
| 90 | "-EB", | 76 | "-EB", |
| 91 | "-mabi=64", | 77 | "-mabi=64", |
| 78 | @@ -1169,13 +1153,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) { | ||
| 87 | - cflags += [ "-no-canonical-prefixes" ] | ||
| 88 | - } | ||
| 89 | } | ||
| 90 | |||
| 91 | config("clang_revision") { | ||
