2017-09-12 19:21:18 +02:00
|
|
|
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
|
2019-03-13 22:27:37 +01:00
|
|
|
index ca6ff2b13809..c48e65157f5b 100644
|
2017-09-12 19:21:18 +02:00
|
|
|
--- build/config/compiler/BUILD.gn
|
|
|
|
+++ build/config/compiler/BUILD.gn
|
2019-03-13 22:27:37 +01:00
|
|
|
@@ -168,7 +168,7 @@ declare_args() {
|
2018-07-02 19:11:49 +02:00
|
|
|
!use_clang_coverage && !(is_android && use_order_profiling) &&
|
2018-06-01 21:16:26 +02:00
|
|
|
(use_lld ||
|
2018-04-19 17:44:42 +02:00
|
|
|
(use_gold &&
|
|
|
|
- ((!is_android && linux_use_bundled_binutils) || is_chromeos ||
|
|
|
|
+ ((!is_android && linux_use_bundled_binutils && current_cpu != "x86") || is_chromeos ||
|
|
|
|
!(current_cpu == "x86" || current_cpu == "x64"))))
|
2018-03-20 21:15:08 +01:00
|
|
|
}
|
|
|
|
|
2019-03-13 22:27:37 +01:00
|
|
|
@@ -1709,8 +1709,6 @@ config("thin_archive") {
|
2019-01-17 10:56:52 +01:00
|
|
|
# archive names to 16 characters, which is not what we want).
|
|
|
|
if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
|
|
|
|
arflags = [ "-T" ]
|
|
|
|
- } else if (is_win && use_lld) {
|
|
|
|
- arflags = [ "/llvmlibthin" ]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|