2018-10-17 00:10:58 +03:00
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
2018-10-26 18:20:45 +03:00
@@ -318,7 +318,7 @@ template("gcc_toolchain") {
2018-10-17 00:10:58 +03:00
} else {
2018-10-26 18:20:45 +03:00
rspfile = "{{output}}.rsp"
rspfile_content = "{{inputs}}"
- command = "\"$ar\" {{arflags}} -r -c -s -D {{output}} @\"$rspfile\""
+ command = "\"$ar\" {{arflags}} rcsD {{output}} @\"$rspfile\""
2018-10-17 00:10:58 +03:00
}
2018-10-26 18:20:45 +03:00
# Remove the output file first so that ar doesn't try to modify the
2018-10-17 00:10:58 +03:00
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
2018-10-26 18:20:45 +03:00
@@ -1689,7 +1689,6 @@ config("thin_archive") {
2018-10-17 00:10:58 +03:00
# 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" ]
}
}
