Fix check-abi and multi-archs
Andreas Jaeger
aj@suse.de
Thu Jun 19 18:50:00 GMT 2003
I just noticed that with the move of the check-abi rules to the
testsuite directory, the multi-arch case does not work properly
anymore since MULTISUBDIR is not passed down to the testsuite.
The appended patch has been tested with GCC 3.3 on x86_64-linux-gnu.
Ok to commit for both branches?
Andreas
2003-06-19 Andreas Jaeger <aj@suse.de>
* configure.in: Pass MULTISUBDIR to testsuite/Makefile.
* configure: Regenerated.
Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure,v
retrieving revision 1.286.2.12
diff -u -p -r1.286.2.12 configure
--- configure 19 Jun 2003 15:53:06 -0000 1.286.2.12
+++ configure 19 Jun 2003 18:08:42 -0000
@@ -24028,9 +24028,9 @@ fi
# Generate the various Makefiles, include files, and scripts.
# NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am
-# and libsupc++/Makefile.am so that multilib installs will end up
-# installed in the correct place. To work around this not being passed
-# down from config-ml.in -> top_srcdir/Makefile.am ->
+# libsupc++/Makefile.am and testsuite/Makefile.am so that multilib installs
+# will end up installed in the correct place. To work around this not being
+# passed down from config-ml.in -> top_srcdir/Makefile.am ->
# top_srcdir/{src,libsupc++}/Makefile.am, manually append it here.
trap '' 1 2 15
cat > confcache <<\EOF
@@ -24524,6 +24524,7 @@ if test -n "$CONFIG_FILES"; then
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
grep '^MULTISUBDIR =' Makefile >> src/Makefile
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+ grep '^MULTISUBDIR =' Makefile >> testsuite/Makefile
fi
chmod +x mkcheck
chmod +x testsuite_flags
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.in,v
retrieving revision 1.110.2.7
diff -u -p -r1.110.2.7 configure.in
--- configure.in 19 Jun 2003 15:53:05 -0000 1.110.2.7
+++ configure.in 19 Jun 2003 18:08:43 -0000
@@ -473,9 +473,9 @@ AC_SUBST(LIBSUPCXX_PICFLAGS)
# Generate the various Makefiles, include files, and scripts.
# NB: Multilibs need MULTISUBDIR defined correctly in src/Makefile.am
-# and libsupc++/Makefile.am so that multilib installs will end up
-# installed in the correct place. To work around this not being passed
-# down from config-ml.in -> top_srcdir/Makefile.am ->
+# libsupc++/Makefile.am and testsuite/Makefile.am so that multilib installs
+# will end up installed in the correct place. To work around this not being
+# passed down from config-ml.in -> top_srcdir/Makefile.am ->
# top_srcdir/{src,libsupc++}/Makefile.am, manually append it here.
AC_OUTPUT(Makefile \
include/Makefile src/Makefile \
@@ -486,6 +486,7 @@ AC_OUTPUT(Makefile \
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
grep '^MULTISUBDIR =' Makefile >> src/Makefile
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+ grep '^MULTISUBDIR =' Makefile >> testsuite/Makefile
fi
chmod +x mkcheck
chmod +x testsuite_flags
@@ -511,6 +512,7 @@ dnl [if test -n "$CONFIG_FILES"; then
dnl ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
dnl grep '^MULTISUBDIR =' Makefile >> src/Makefile
dnl grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
+dnl grep '^MULTISUBDIR =' Makefile >> testsuite/Makefile
dnl fi
dnl chmod +x mkcheck
dnl chmod +x testsuite_flags
--
Andreas Jaeger, SuSE Linux AG, aj@suse.de, http://www.suse.de/~aj
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20030619/0faa3c26/attachment.sig>
More information about the Gcc-patches
mailing list