This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch: PR libgcj/26522 (includes change in config/)
- From: Tom Tromey <tromey at redhat dot com>
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 07 Mar 2006 11:36:01 -0700
- Subject: Patch: PR libgcj/26522 (includes change in config/)
- Reply-to: tromey at redhat dot com
This patch fixes PR libgcj/26522, a build regression involving
--enable-version-specific-runtime-libs
Tested on x86 FC4. I plan to apply this to both the trunk and the
4.1 branch.
I'm asking for approval because I added a comment in
config/gxx-include-dir.m4, to explain the libsubdir requirement.
Ok?
Tom
:ADDPATCH build:
Index: config/ChangeLog
from Tom Tromey <tromey@redhat.com>
PR libgcj/26522:
* gxx-include-dir.m4: Document libsubdir requirement.
Index: libjava/ChangeLog
from Tom Tromey <tromey@redhat.com>
PR libgcj/26522:
* Makefile.in: Rebuilt.
* Makefile.am (libsubdir): New variable.
Index: config/gxx-include-dir.m4
===================================================================
--- config/gxx-include-dir.m4 (revision 111573)
+++ config/gxx-include-dir.m4 (working copy)
@@ -6,6 +6,9 @@
dnl
dnl If you change the default here, you'll need to change the gcc and
dnl libstdc++-v3 subdirectories too.
+dnl
+dnl If you use this macro, your Makefile must define the libsubdir
+dnl variable.
AC_DEFUN([TL_AC_GXX_INCLUDE_DIR],
[
case "${with_gxx_include_dir}" in
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am (revision 111573)
+++ libjava/Makefile.am (working copy)
@@ -26,6 +26,9 @@
# autoconf2.13's target_alias
target_noncanonical = @target_noncanonical@
+# This is required by TL_AC_GXX_INCLUDE_DIR.
+libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
+
##
## What gets installed, and where.
##