mirror of
https://abf.rosa.ru/djam/chromium-browser-stable-test.git
synced 2025-02-24 10:02:47 +00:00
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
--- chromium-67.0.3396.87/build/toolchain/gcc_toolchain.gni-orig 2018-06-24 18:04:54.000000000 +0300
|
|
+++ chromium-67.0.3396.87/build/toolchain/gcc_toolchain.gni 2018-06-24 18:06:03.988744430 +0300
|
|
@@ -343,7 +343,7 @@
|
|
# 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
|
|
--- chromium-67.0.3396.87/build/config/compiler/BUILD.gn-orig 2018-06-13 01:10:02.000000000 +0300
|
|
+++ chromium-67.0.3396.87/build/config/compiler/BUILD.gn 2018-06-24 18:38:35.336737687 +0300
|
|
@@ -1570,10 +1570,12 @@
|
|
# .o files, instead of just references to .o files in the build directoy
|
|
config("thin_archive") {
|
|
if ((is_posix && !is_nacl) || is_fuchsia) {
|
|
- # TODO(thomasanderson): Enable on ChromeOS builds once
|
|
- # https://crbug.com/829956 is fixed.
|
|
- if (default_toolchain != "//build/toolchain/cros:target") {
|
|
- arflags = [ "-T" ]
|
|
+ # TODO(thomasanderson): Remove !is_clang conditional once llvm-ar supports
|
|
+ # multiple dashed flags.
|
|
+ if (!is_clang) {
|
|
+ # TODO(thomasanderson): Introduce -T once :thin_archive is removed from
|
|
+ # all third_party repos where appropriate.
|
|
+ # arflags = [ "-T" ]
|
|
}
|
|
}
|
|
}
|