This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[libstdc++ PATCH] Fix check-abi with relative top_srcdir
- From: Jakub Jelinek <jakub at redhat dot com>
- To: libstdc++ at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Wed, 16 Oct 2002 23:59:25 +0200
- Subject: [libstdc++ PATCH] Fix check-abi with relative top_srcdir
- Reply-to: Jakub Jelinek <jakub at redhat dot com>
Hi!
With my favourite way of building gcc (ie. having the builddir
as subdirectory of the toplevel directory and configuring using
../configure
) make check-abi stopped working recently.
The problem is that check-abi goal first changes current directory
and then uses top_srcdir which may be a relative path, bogus after
the cd testsuite.
@glibcpp_srcdir@ on the other side contains always the absolute path
and as such seems to be better suited for this.
Ok to commit?
2002-10-16 Jakub Jelinek <jakub@redhat.com>
* Makefile.am (check-abi, new-abi-baseline): Use @glibcpp_srcdir@
instead of ${top_srcdir}.
* Makefile.in: Rebuilt.
--- libstdc++-v3/Makefile.am.jj 2002-10-12 23:47:05.000000000 +0200
+++ libstdc++-v3/Makefile.am 2002-10-17 00:05:22.000000000 +0200
@@ -51,7 +51,7 @@ check-script-install: $(top_builddir)/mk
baseline_file = @baseline_file@
check-abi: $(top_builddir)/testsuite/abi_check
-@(cd testsuite; \
- ${top_srcdir}/config/abi/extract_symvers \
+ @glibcpp_srcdir@/config/abi/extract_symvers \
../src/.libs/libstdc++.so \
./current_symbols.txt && \
./abi_check --check ./current_symbols.txt ${baseline_file})
@@ -63,7 +63,7 @@ new-abi-baseline:
t=`echo $${output} | sed 's=.*config/abi/=='`; \
echo "Baseline file already exists, writing to $${t} instead."; \
fi; \
- ${top_srcdir}/config/abi/extract_symvers \
+ @glibcpp_srcdir@/config/abi/extract_symvers \
src/.libs/libstdc++.so $${output})
# These rules are messy, but are hella worth it.
--- libstdc++-v3/Makefile.in.jj 2002-10-12 23:47:05.000000000 +0200
+++ libstdc++-v3/Makefile.in 2002-10-17 00:05:54.000000000 +0200
@@ -487,7 +487,7 @@ check-script-install: $(top_builddir)/mk
@glibcpp_builddir@/mkcheck 1)
check-abi: $(top_builddir)/testsuite/abi_check
-@(cd testsuite; \
- ${top_srcdir}/config/abi/extract_symvers \
+ @glibcpp_srcdir@/config/abi/extract_symvers \
../src/.libs/libstdc++.so \
./current_symbols.txt && \
./abi_check --check ./current_symbols.txt ${baseline_file})
@@ -499,7 +499,7 @@ new-abi-baseline:
t=`echo $${output} | sed 's=.*config/abi/=='`; \
echo "Baseline file already exists, writing to $${t} instead."; \
fi; \
- ${top_srcdir}/config/abi/extract_symvers \
+ @glibcpp_srcdir@/config/abi/extract_symvers \
src/.libs/libstdc++.so $${output})
# These rules are messy, but are hella worth it.
Jakub