Extend the patch

This commit is contained in:
Mikhail Novosyolov 2018-10-21 17:14:39 +03:00
parent b7e3d8651d
commit 9fa748bfef

View file

@ -22,10 +22,11 @@ Author: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
--- a/build/config/compiler/compiler.gni 2018-10-21 02:15:50.290369454 +0300
+++ b/build/config/compiler/compiler.gni 2018-10-21 12:38:18.521273343 +0300
@@ -158,19 +158,6 @@
@@ -157,30 +157,6 @@
}
}
declare_args() {
-declare_args() {
- # Set to true to use lld, the LLVM linker. This flag may be used on Windows,
- # Linux or Fuchsia.
- # TODO(pcc): Enable lld on more architectures on Linux. E.g. we probably need
@ -39,6 +40,18 @@ Author: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
-}
-
-declare_args() {
# Whether to use the gold linker from binutils instead of lld or bfd.
use_gold = !use_lld && !(is_chromecast && is_linux &&
(current_cpu == "arm" || current_cpu == "mipsel")) &&
- # Whether to use the gold linker from binutils instead of lld or bfd.
- use_gold = !use_lld && !(is_chromecast && is_linux &&
- (current_cpu == "arm" || current_cpu == "mipsel")) &&
- ((is_linux && (current_cpu == "x64" || current_cpu == "x86" ||
- current_cpu == "arm" || current_cpu == "mipsel" ||
- current_cpu == "mips64el")) ||
- (is_android && (current_cpu == "x86" || current_cpu == "x64" ||
- current_cpu == "arm" || current_cpu == "arm64")))
-}
-
# If it wasn't manually set, set to an appropriate default.
assert(symbol_level >= -1 && symbol_level <= 2, "Invalid symbol_level")
if (symbol_level == -1) {