From 29f095214040d604e9ec4f933bd2c3bfad7a722b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 30 May 2014 12:11:15 +0100 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b9520d3a4e6..b90cc3b3c17 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2014-05-30 Jonathan Wakely + + * testsuite/lib/libstdc++.exp (libstdc++_init): Adjust regexp to + work with previous versions of Tcl. + 2014-05-29 Jonathan Wakely * 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 2b2a38be13a..d91bed64719 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" }