backport: re PR libstdc++/36211 (__iconv_adaptor chooses char** where const char** is required)

2009-05-21  David Billinghurst <billingd@gcc.gnu.org>

	Backport from mainline:
	PR libstdc++/36211
	* testsuite/lib/libstdc++.exp(v3_target_compile):  Add
	cxxldflags to additional_flags rather than cxx_final.

From-SVN: r147762
This commit is contained in:
David Billinghurst 2009-05-21 11:30:55 +00:00
parent 060770417c
commit fd5a3a5831
2 changed files with 8 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2009-05-21 David Billinghurst <billingd@gcc.gnu.org>
Backport from mainline:
PR libstdc++/36211
* testsuite/lib/libstdc++.exp(v3_target_compile): Add
cxxldflags to additional_flags rather than cxx_final.
2009-05-18 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/40192

View File

@ -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.