PATCH: other/17789: Cannot 'make check' inside libstdc++-v3
H. J. Lu
hjl@lucon.org
Sat Oct 2 23:40:00 GMT 2004
On Sat, Oct 02, 2004 at 02:14:03AM +0200, Paolo Carlini wrote:
> H. J. Lu wrote:
>
> >Open a bug. I will fix it. The fix should be similar to the change in
> >gcc/Makefile.
> >
> >
> Indeed, I was afraid it could be *the same* bug. Anyway... just done,
> it's other/17789.
>
Here is a patch.
H.J.
----
2004-10-02 H.J. Lu <hongjiu.lu@intel.com>
PR other/17789
* Makefile.am (@set_gcc_lib_path@): Added.
* testsuite/Makefile.am (@set_gcc_lib_path@): Added.
* Makefile.in: Regenerated.
* testsuite/Makefile.in: Regenerated.
* acinclude.m4: Include ../config/gcc-lib-path.m4.
* aclocal.m4: Regenerated.
* configure.ac: Use TL_AC_GNU_MAKE_GCC_LIB_PATH.
* configure: Regenerated.
--- libstdc++-v3/Makefile.am.ld-path 2004-08-02 16:25:37.000000000 -0700
+++ libstdc++-v3/Makefile.am 2004-10-01 17:32:47.000000000 -0700
@@ -24,6 +24,9 @@
include $(top_srcdir)/fragment.am
+# Set up library path if needed.
+@set_gcc_lib_path@
+
if GLIBCXX_HOSTED
hosted_source = libmath src po testsuite
endif
--- libstdc++-v3/acinclude.m4.ld-path 2004-09-28 12:02:09.000000000 -0700
+++ libstdc++-v3/acinclude.m4 2004-10-01 17:32:47.000000000 -0700
@@ -1748,4 +1748,6 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN])
AC_DEFUN([AC_PROG_LD])
])
+sinclude(../config/gcc-lib-path.m4)
+
dnl vim:et:ts=2:sw=2
--- libstdc++-v3/configure.ac.ld-path 2004-09-28 12:02:11.000000000 -0700
+++ libstdc++-v3/configure.ac 2004-10-01 17:32:47.000000000 -0700
@@ -308,6 +308,8 @@ else
fi
AC_SUBST(LIBSUPCXX_PICFLAGS)
+TL_AC_GNU_MAKE_GCC_LIB_PATH
+
dnl In autoconf 2.5x, AC_OUTPUT is replaced by four AC_CONFIG_* macros,
dnl which can all be called multiple times as needed, plus one (different)
dnl AC_OUTPUT macro. This one lists the files to be created:
--- libstdc++-v3/testsuite/Makefile.am.ld-path 2004-05-13 07:56:35.000000000 -0700
+++ libstdc++-v3/testsuite/Makefile.am 2004-10-02 16:13:45.000000000 -0700
@@ -25,6 +25,9 @@ AUTOMAKE_OPTIONS = dejagnu
include $(top_srcdir)/fragment.am
+# Set up library path if needed.
+@set_gcc_lib_path@
+
AM_MAKEFLAGS = -j1
AM_RUNTESTFLAGS =
More information about the Gcc-patches
mailing list