aboutsummaryrefslogtreecommitdiffstats
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.patch40
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
index 17f486447fe..06c93e5b3cf 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
-@@ -570,13 +570,6 @@ config("compiler") {
- }
- }
-
-- # Tells the compiler not to use absolute paths when passing the default
-- # paths to the tools it invokes. We don't want this because we don't
-- # really need it and it can mess up the goma cache entries.
-- if (is_clang && !is_nacl) {
-- cflags += [ "-no-canonical-prefixes" ]
-- }
--
- # C11/C++11 compiler flags setup.
- # ---------------------------
- if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
-@@ -815,8 +808,6 @@ config("compiler_cpu_abi") {
+@@ -773,8 +773,6 @@ config("compiler_cpu_abi") {
}
} else if (current_cpu == "arm") {
if (is_clang && !is_android && !is_nacl) {
@@ -36,7 +22,7 @@ index 17f486447fe..06c93e5b3cf 100644
}
if (!is_nacl) {
cflags += [
-@@ -829,8 +820,6 @@ config("compiler_cpu_abi") {
+@@ -787,8 +785,6 @@ config("compiler_cpu_abi") {
}
} else if (current_cpu == "arm64") {
if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -45,7 +31,7 @@ index 17f486447fe..06c93e5b3cf 100644
}
} else if (current_cpu == "mipsel" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
-@@ -839,9 +828,6 @@ config("compiler_cpu_abi") {
+@@ -797,9 +793,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mipsel-linux-android" ]
ldflags += [ "--target=mipsel-linux-android" ]
@@ -55,7 +41,7 @@ index 17f486447fe..06c93e5b3cf 100644
}
} else {
cflags += [ "-EL" ]
-@@ -920,10 +906,7 @@ config("compiler_cpu_abi") {
+@@ -878,10 +871,7 @@ config("compiler_cpu_abi") {
} else if (current_cpu == "mips" && !is_nacl) {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -67,7 +53,7 @@ index 17f486447fe..06c93e5b3cf 100644
cflags += [ "-EB" ]
ldflags += [ "-EB" ]
}
-@@ -970,9 +953,6 @@ config("compiler_cpu_abi") {
+@@ -928,9 +918,6 @@ config("compiler_cpu_abi") {
if (is_android) {
cflags += [ "--target=mips64el-linux-android" ]
ldflags += [ "--target=mips64el-linux-android" ]
@@ -77,7 +63,7 @@ index 17f486447fe..06c93e5b3cf 100644
}
} else {
cflags += [
-@@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") {
+@@ -987,10 +974,7 @@ config("compiler_cpu_abi") {
} else if (current_cpu == "mips64") {
ldflags += [ "-Wl,--hash-style=sysv" ]
if (custom_toolchain == "") {
@@ -89,3 +75,17 @@ index 17f486447fe..06c93e5b3cf 100644
cflags += [
"-EB",
"-mabi=64",
+@@ -1169,13 +1153,6 @@ config("compiler_deterministic") {
+ }
+ }
+ }
+-
+- # Tells the compiler not to use absolute paths when passing the default
+- # paths to the tools it invokes. We don't want this because we don't
+- # really need it and it can mess up the goma cache entries.
+- if (is_clang && !is_nacl) {
+- cflags += [ "-no-canonical-prefixes" ]
+- }
+ }
+
+ config("clang_revision") {