From 602feda58d81ba6da4154cbb3e1bc3e9b6578a1e Mon Sep 17 00:00:00 2001 From: David Billinghurst Date: Fri, 15 May 2009 09:23:58 +0000 Subject: [PATCH] re PR libstdc++/36211 (__iconv_adaptor chooses char** where const char** is required) 2009-05-15 David Billinghurst PR libstdc++/36211 * testsuite/lib/libstdc++.exp(v3_target_compile): Add cxxldflags to additional_flags rather than cxx_final. From-SVN: r147565 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/testsuite/lib/libstdc++.exp | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f37e28a5efaf..b82cc2c256e5 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2009-05-15 David Billinghurst + + PR libstdc++/36211 + * testsuite/lib/libstdc++.exp(v3_target_compile): Add + cxxldflags to additional_flags rather than cxx_final. + 2009-05-15 David Billinghurst * testsuite/26_numerics/random/discrete_distribution/cons/num_xbound_fun.cc: diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 3adf91c77180..45e92d756ecf 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -402,8 +402,7 @@ proc v3_target_compile { source dest type options } { # Flag setting based on type argument. if { $type == "executable" } { # Link the support objects into executables. - set cxx_final [concat $cxx_final $cxxldflags] - lappend options "additional_flags=./libtestc++.a" + lappend options "additional_flags=./libtestc++.a $cxxldflags" } else { if { $type == "sharedlib" } { # Don't link in anything.