summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-11 15:32:14 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-11 15:32:14 +0000
commit5bee53377fc69cc5268d8d75b1efe2321646c574 (patch)
tree38cf97185852310152b389d0f5fedda22a56b1e6
parentb5905560b8cc2bf7e22cf6f5c0a2048d7fc3ee40 (diff)
downloadgcc-5bee53377fc69cc5268d8d75b1efe2321646c574.tar.gz
2014-07-11 Samuel Bronson <naesten@gmail.com>
* testsuite/lib/libstdc++.exp (libstdc++_init): Set $GCC_COLORS="" instead of insisting that GCC understand -fdiagnostics-color=never git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212458 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/lib/libstdc++.exp4
2 files changed, 8 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 29fbb3051fa..38a3c93f027 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,9 @@
2014-07-11 Samuel Bronson <naesten@gmail.com>
+
+ * testsuite/lib/libstdc++.exp (libstdc++_init): Set $GCC_COLORS=""
+ instead of insisting that GCC understand -fdiagnostics-color=never
+
+2014-07-11 Samuel Bronson <naesten@gmail.com>
Matthias Klose <doko@ubuntu.com>
PR libstdc++/58962
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index d91bed64719..0fdfbdc4b72 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