Commit f697ab1d authored by Takuto Ikuta's avatar Takuto Ikuta Committed by Commit Bot

Revert "Reland "build: Default use_lld to true on ChromeOS for x64""

This reverts commit 7c0e6537.

Reason for revert: Build broken again???
https://ci.chromium.org/buildbot/chromium.chrome/Google%20Chrome%20ChromeOS/61090

Original change's description:
> Reland "build: Default use_lld to true on ChromeOS for x64"
> 
> This is a reland of 3c031af0
> 
> I changed libassistant to use lld when lld is used to build chrome in:
> https://chrome-internal-review.googlesource.com/c/chrome/assistant/+/800068
> 
> Original change's description:
> > build: Default use_lld to true on ChromeOS for x64
> >
> > This is a partial reland of 12b1bbff
> >
> > I confirmed current lld can link chrome with the same config of previously failed build.
> > https://ci.chromium.org/buildbot/chromium.chrome/Google%20Chrome%20ChromeOS/59619
> >
> > Original change's description:
> > > build: Default use_lld to true on ChromeOS.
> > >
> > > As of https://chromium-review.googlesource.com/c/1372768 ChromeOS
> > > chrome is always linked with lld. Because ChromeOS's build system
> > > always overrides the value of use_lld this change should have no
> > > effect on official ChromeOS builds, but it should make ChromeOS on
> > > Linux more consistent with "real" ChromeOS.
> > >
> > > Bug: 701659
> > > Change-Id: I447e1b2dfb6cc970f2c2dd64d396b5ba58bc2ef2
> > > Reviewed-on: https://chromium-review.googlesource.com/c/1377139
> > > Reviewed-by: Nico Weber <thakis@chromium.org>
> > > Commit-Queue: Peter Collingbourne <pcc@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#616485}
> >
> > Bug: 701659, 923168, 917504
> > Change-Id: Iedb48cfe5b3b9c189dcf1b4c04bea998ee009d2c
> > Reviewed-on: https://chromium-review.googlesource.com/c/1419558
> > Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
> > Reviewed-by: George Burgess <gbiv@chromium.org>
> > Commit-Queue: George Burgess <gbiv@chromium.org>
> > Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#624005}
> 
> Bug: 701659, 923168, 917504
> Change-Id: Ibdb678d59313d7defdb3238e307bbf525dd94dfa
> Reviewed-on: https://chromium-review.googlesource.com/c/1437040
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#626850}

TBR=thakis@chromium.org,pcc@chromium.org,gbiv@chromium.org,tikuta@chromium.org

Change-Id: I7964f3e807df07d9000e9af3b2e3c41f3a625050
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 701659, 923168, 917504
Reviewed-on: https://chromium-review.googlesource.com/c/1442075Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626901}
parent f8bc6c6e
...@@ -171,11 +171,9 @@ declare_args() { ...@@ -171,11 +171,9 @@ declare_args() {
declare_args() { declare_args() {
# Set to true to use lld, the LLVM linker. # Set to true to use lld, the LLVM linker.
# https://crbug.com/911658 for using lld on 32-bit linux. # https://crbug.com/911658 for using lld on 32-bit linux.
# https://crbug.com/917504 for arm chromeos
use_lld = is_clang && use_lld = is_clang &&
(is_win || is_fuchsia || is_android || (is_win || is_fuchsia || is_android ||
(is_linux && target_os != "chromeos" && current_cpu != "x86") || (is_linux && target_os != "chromeos" && current_cpu != "x86"))
(target_os == "chromeos" && current_cpu != "arm"))
} }
declare_args() { declare_args() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment