aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2009-11-11 23:44:32 -0500
committerJason Merrill <jason@gcc.gnu.org>2009-11-11 23:44:32 -0500
commit0a8fff5778dd361e64a01c1e2567f7d06d08c275 (patch)
tree8596c4219cdf6a6c5c348bf0cb7800178a2438f0
parentfae927d3bd1c1d5bcef31763547658d8ee5336d0 (diff)
downloadgcc-0a8fff5778dd361e64a01c1e2567f7d06d08c275.zip
gcc-0a8fff5778dd361e64a01c1e2567f7d06d08c275.tar.gz
gcc-0a8fff5778dd361e64a01c1e2567f7d06d08c275.tar.bz2
Makefile.am: Remove use of baseline_file.
* testsuite/Makefile.am: Remove use of baseline_file. * testsuite/Makefile.in: Likewise. From-SVN: r154114
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/testsuite/Makefile.am4
-rw-r--r--libstdc++-v3/testsuite/Makefile.in4
3 files changed, 7 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c075117..2721405 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
2009-11-11 Jason Merrill <jason@redhat.com>
+ * testsuite/Makefile.am: Remove use of baseline_file.
+ * testsuite/Makefile.in: Likewise.
+
PR c++/39131
* config/abi/pre/gnu.ver: Add DFP types.
* testsuite/util/testsuite_abi.cc (check_version): Add CXXABI_1.3.4.
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index c817607..a2f4fa4 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -70,7 +70,7 @@ site.exp: Makefile
extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers
baseline_symbols:
- -@(output=${baseline_file}; \
+ -@(output=${baseline_dir}/baseline_symbols.txt; \
if test ! -f $${output}; then \
echo "Baseline file doesn't exist."; \
echo "Try 'make new-abi-baseline' to create it."; \
@@ -79,7 +79,7 @@ baseline_symbols:
new-abi-baseline:
-@$(mkinstalldirs) ${baseline_dir}
- -@(output=${baseline_file}; \
+ -@(output=${baseline_dir}/baseline_symbols.txt; \
if test -f $${output}; then \
output=$${output}.new; \
t=`echo $${output} | sed 's=.*config/abi/=='`; \
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index cae3d6c..bf767cd 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -527,7 +527,7 @@ site.exp: Makefile
@mv site.tmp site.exp
baseline_symbols:
- -@(output=${baseline_file}; \
+ -@(output=${baseline_dir}/baseline_symbols.txt; \
if test ! -f $${output}; then \
echo "Baseline file doesn't exist."; \
echo "Try 'make new-abi-baseline' to create it."; \
@@ -536,7 +536,7 @@ baseline_symbols:
new-abi-baseline:
-@$(mkinstalldirs) ${baseline_dir}
- -@(output=${baseline_file}; \
+ -@(output=${baseline_dir}/baseline_symbols.txt; \
if test -f $${output}; then \
output=$${output}.new; \
t=`echo $${output} | sed 's=.*config/abi/=='`; \