diff options
| author | Phil Edwards <phil@codesourcery.com> | 2004-03-19 11:34:47 +0000 |
|---|---|---|
| committer | Phil Edwards <pme@gcc.gnu.org> | 2004-03-19 11:34:47 +0000 |
| commit | d54bc1d870a81e72b3418abaeef9a3b1c997a945 (patch) | |
| tree | 05e016085db5fbc026e884949a40ffea756b57c4 /libstdc++-v3/testsuite/Makefile.am | |
| parent | dbee7ab93c2c22ce25aa38033073a437e787a96a (diff) | |
| download | gcc-d54bc1d870a81e72b3418abaeef9a3b1c997a945.tar.gz | |
acinclude.m4 (GLIBCXX_CHECK_WCHAR_T_SUPPORT): Set LIBICONV, not libiconv.
2004-03-19 Phil Edwards <phil@codesourcery.com>
* acinclude.m4 (GLIBCXX_CHECK_WCHAR_T_SUPPORT): Set LIBICONV,
not libiconv. SUBST this variable as well.
* testsuite/Makefile.am (site.exp): New target, based on that
created by automake. Also set libiconv.
* configure, Makefile.in, include/Makefile.in, libmath/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in,
testsuite/Makefile.in: Regenerate.
From-SVN: r79678
Diffstat (limited to 'libstdc++-v3/testsuite/Makefile.am')
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.am | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index e22cbb7f56b..0dffb3e8286 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -69,6 +69,32 @@ else stamp_wchar: endif +# We need more things in site.exp, but automake completely controls the +# creation of that file; there's no way to append to it without messing up +# the dependancy chains. So we overrule automake. This rule is exactly +# what it would have generated, plus our own additions. +site.exp: Makefile + @echo 'Making a new site.exp file...' + @echo '## these variables are automatically generated by make ##' >site.tmp + @echo '# Do not edit here. If you wish to override these values' >>site.tmp + @echo '# edit the last section' >>site.tmp + @echo 'set srcdir $(srcdir)' >>site.tmp + @echo "set objdir `pwd`" >>site.tmp + @echo 'set build_alias "$(build_alias)"' >>site.tmp + @echo 'set build_triplet $(build_triplet)' >>site.tmp + @echo 'set host_alias "$(host_alias)"' >>site.tmp + @echo 'set host_triplet $(host_triplet)' >>site.tmp + @echo 'set target_alias "$(target_alias)"' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set libiconv "$(LIBICONV)"' >>site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp + @-rm -f site.bak + @test ! -f site.exp || mv site.exp site.bak + @mv site.tmp site.exp + # This is automatically run after the generated check-DEJAGNU rule. check-local: check-abi |