mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-slava86.git
synced 2025-02-24 16:02:56 +00:00
25 lines
992 B
Diff
25 lines
992 B
Diff
|
Description: partially revert changes in https://chromium.googlesource.com/chromium/src/+/40a8d84 that require a version of llvm-ar that's more recent than what is in bionic
|
||
|
|
Author: Olivier Tilloy <olivier.tilloy@canonical.com>
|
||
|
|
|
||
|
|
--- a/build/toolchain/gcc_toolchain.gni
|
||
|
|
+++ b/build/toolchain/gcc_toolchain.gni
|
||
|
|
@@ -339,7 +339,7 @@ template("gcc_toolchain") {
|
||
|
|
# We use slightly different arflags for AIX.
|
||
|
|
extra_arflags = "-r -c -s"
|
||
|
|
} else {
|
||
|
|
- extra_arflags = "-r -c -s -D"
|
||
|
|
+ extra_arflags = "rcsD"
|
||
|
|
}
|
||
|
|
|
||
|
|
# Almost all targets build with //build/config/compiler:thin_archive which
|
||
|
|
--- a/build/config/compiler/BUILD.gn
|
||
|
|
+++ b/build/config/compiler/BUILD.gn
|
||
|
|
@@ -1642,7 +1642,6 @@ config("thin_archive") {
|
||
|
|
# have a "thin archive" mode (it does accept -T, but it means truncating
|
||
|
|
# archive names to 16 characters, which is not what we want).
|
||
|
|
if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
|
||
|
|
- arflags = [ "-T" ]
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|