From 7cd41cda09923a7c57f9bfda863455e3040b69c6 Mon Sep 17 00:00:00 2001 From: Samuel Bronson Date: Fri, 11 Jul 2014 15:32:14 +0000 Subject: [PATCH] libstdc++.exp (libstdc++_init): Set $GCC_COLORS="" instead of insisting that GCC understand... 2014-07-11 Samuel Bronson * testsuite/lib/libstdc++.exp (libstdc++_init): Set $GCC_COLORS="" instead of insisting that GCC understand -fdiagnostics-color=never From-SVN: r212458 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 29fbb3051fa7..38a3c93f027e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-07-11 Samuel Bronson + + * testsuite/lib/libstdc++.exp (libstdc++_init): Set $GCC_COLORS="" + instead of insisting that GCC understand -fdiagnostics-color=never + 2014-07-11 Samuel Bronson Matthias Klose diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index d91bed647197..0fdfbdc4b722 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -289,9 +289,11 @@ proc libstdc++_init { testfile } { v3track cxxflags 2 + # Should be as good as -fdiagnostics-color=never, but more compatible + setenv GCC_COLORS "" # Always use MO files built by this test harness. - set cxxflags "-fdiagnostics-color=never $cxxflags -DLOCALEDIR=\".\"" set ccflags "$cxxflags -DLOCALEDIR=\".\"" + set cxxflags "$cxxflags -DLOCALEDIR=\".\"" # If a PCH file is available, use it. We must delay performing # this check until $cxx and such have been initialized because we