From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 30 May 2014 11:11:15 +0000 (+0100)
Subject: libstdc++.exp (libstdc++_init): Adjust regexp to work with previous versions of Tcl.
X-Git-Tag: releases/gcc-5.1.0~7195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29f095214040d604e9ec4f933bd2c3bfad7a722b;p=thirdparty%2Fgcc.git

libstdc++.exp (libstdc++_init): Adjust regexp to work with previous versions of Tcl.

	* testsuite/lib/libstdc++.exp (libstdc++_init): Adjust regexp to
	work with previous versions of Tcl.

From-SVN: r211077
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b9520d3a4e62..b90cc3b3c172 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-30  Jonathan Wakely  <jwakely@redhat.com>
+
+	* testsuite/lib/libstdc++.exp (libstdc++_init): Adjust regexp to
+	work with previous versions of Tcl.
+
 2014-05-29  Jonathan Wakely  <jwakely@redhat.com>
 
 	* include/tr2/bool_set: Use UTF-8 for accented characters.
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 2b2a38be13a6..d91bed647197 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -283,7 +283,7 @@ proc libstdc++_init { testfile } {
     append cxxflags " "
     append cxxflags [getenv CXXFLAGS]
 
-    if ![regexp "\-O" $cxxflags] {
+    if ![regexp ".*-O" $cxxflags] {
 	append cxxflags " -g -O2"
     }