summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2017-03-24 23:21:34 +0000
committerRui Ueyama <ruiu@google.com>2017-03-24 23:21:34 +0000
commit22f0d804f57b685028ea4c0f77ac6a46b5fc5785 (patch)
tree651efb9ccf0a34c8b4e0df31a6fa36bbae517066
parent561d72c3289db35d56e018966055c0b18baa955e (diff)
downloadbcm5719-llvm-22f0d804f57b685028ea4c0f77ac6a46b5fc5785.tar.gz
bcm5719-llvm-22f0d804f57b685028ea4c0f77ac6a46b5fc5785.zip
Use raw_fd_ostream::has_colors instead of StandardErrHasColors().
I just didn't know that raw_fd_ostream has has_colors() function. llvm-svn: 298749
-rw-r--r--lld/ELF/DriverUtils.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/lld/ELF/DriverUtils.cpp b/lld/ELF/DriverUtils.cpp
index 7ba2a2c40b4..9e88dc6a9f5 100644
--- a/lld/ELF/DriverUtils.cpp
+++ b/lld/ELF/DriverUtils.cpp
@@ -53,12 +53,10 @@ ELFOptTable::ELFOptTable() : OptTable(OptInfo) {}
// Parse -color-diagnostics={auto,always,never} or -no-color-diagnostics.
static bool getColorDiagnostics(opt::InputArgList &Args) {
- bool Default = (ErrorOS == &errs() && Process::StandardErrHasColors());
-
auto *Arg = Args.getLastArg(OPT_color_diagnostics, OPT_color_diagnostics_eq,
OPT_no_color_diagnostics);
if (!Arg)
- return Default;
+ return ErrorOS->has_colors();
if (Arg->getOption().getID() == OPT_color_diagnostics)
return true;
if (Arg->getOption().getID() == OPT_no_color_diagnostics)
@@ -66,7 +64,7 @@ static bool getColorDiagnostics(opt::InputArgList &Args) {
StringRef S = Arg->getValue();
if (S == "auto")
- return Default;
+ return ErrorOS->has_colors();
if (S == "always")
return true;
if (S != "never")
OpenPOWER on IntegriCloud