mirror of
https://abf.rosa.ru/djam/chromium-browser-stable.git
synced 2025-02-24 15:12:49 +00:00
23 lines
1 KiB
Diff
23 lines
1 KiB
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
|
|
@@ -318,7 +318,7 @@ template("gcc_toolchain") {
|
|
} else {
|
|
rspfile = "{{output}}.rsp"
|
|
rspfile_content = "{{inputs}}"
|
|
- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\""
|
|
+ command = "\"$ar\" {{arflags}} rcsD {{output}} @\"$rspfile\""
|
|
}
|
|
|
|
# Remove the output file first so that ar doesn't try to modify the
|
|
--- a/build/config/compiler/BUILD.gn
|
|
+++ b/build/config/compiler/BUILD.gn
|
|
@@ -1689,7 +1689,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" ]
|
|
}
|
|
}
|