Commit 18da5f23 authored by Tommy Li's avatar Tommy Li Committed by Commit Bot

Revert "Let lld emit colored diagnostics when invoked from ninja."

This reverts commit 00db3ddc.

Reason for revert: Breaks Linux CFI build here: https://ci.chromium.org/buildbot/chromium.memory/Linux%20CFI/8024

Original change's description:
> Let lld emit colored diagnostics when invoked from ninja.
> 
> Bug: 841221
> Change-Id: I72d13c78a2c623865a4f29542d25f6b3488b350b
> Reviewed-on: https://chromium-review.googlesource.com/1067460
> Reviewed-by: Reid Kleckner <rnk@chromium.org>
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#560343}

TBR=thakis@chromium.org,rnk@chromium.org

Change-Id: I3811083daa622dca605ca32be5cc4c7098b60b4a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 841221
Reviewed-on: https://chromium-review.googlesource.com/1067949Reviewed-by: default avatarTommy Li <tommycli@chromium.org>
Commit-Queue: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560345}
parent ac188f98
...@@ -485,19 +485,6 @@ config("compiler") { ...@@ -485,19 +485,6 @@ config("compiler") {
cflags += [ "-fmerge-all-constants" ] cflags += [ "-fmerge-all-constants" ]
} }
if (use_lld) {
# TODO(thakis): Make the driver pass --color-diagnostics to the linker
# if -fcolor-diagnostics is passed to it, and pass -fcolor-diagnostics
# in ldflags instead.
if (is_win) {
# On Windows, we call the linker directly, instead of calling it through
# the driver.
ldflags += [ "--color-diagnostics" ]
} else {
ldflags += [ "-Wl,--color-diagnostics" ]
}
}
if (is_clang && !is_nacl && current_toolchain == host_toolchain && if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
target_os != "chromeos") { target_os != "chromeos") {
cflags += [ cflags += [
......
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