This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] PR/29802, ada does not build with srcdir=.
- From: Paolo Bonzini <paolo dot bonzini at lu dot unisi dot ch>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Thu, 16 Nov 2006 17:52:47 +0100
- Subject: [PATCH] PR/29802, ada does not build with srcdir=.
Just HOST_SUBDIR missing in a couple of places. Will commit as obvious
in a couple of days unless somebody screams (build maintainers may want
to look at the PR/29544 patch instead).
Paolo
2006-11-16 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/29802
* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Add HOST_SUBDIR in STAGE_PREFIX.
* Makefile.in: Regenerate.
libada:
2006-11-16 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/29802
* configure.ac: Call GCC_TOPLEV_SUBDIRS.
* configure: Regenerate.
* Makefile.in: Replace host_subdir.
Index: Makefile.tpl
===================================================================
--- Makefile.tpl (revision 118810)
+++ Makefile.tpl (working copy)
@@ -41855,7 +41855,7 @@ objext = .o
# Flags to pass to stage2 and later makes.
POSTSTAGE1_FLAGS_TO_PASS = \
CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
- STAGE_PREFIX=$$r/prev-gcc/ \
+ STAGE_PREFIX="$$r/$(HOST_SUBDIR)/prev-gcc/" \
CFLAGS="$(BOOT_CFLAGS)" \
LIBCFLAGS="$(BOOT_CFLAGS)" \
LDFLAGS="$(BOOT_LDFLAGS)" \
Index: libada/configure.ac
===================================================================
--- libada/configure.ac (revision 118809)
+++ libada/configure.ac (working copy)
@@ -20,6 +20,9 @@ AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([Makefile.in])
+sinclude(../config/acx.m4)
+GCC_TOPLEV_SUBDIRS
+
# Command-line options.
# Very limited version of AC_MAINTAINER_MODE.
AC_ARG_ENABLE([maintainer-mode],
Index: libada/Makefile.in
===================================================================
--- libada/Makefile.in (revision 118809)
+++ libada/Makefile.in (working copy)
@@ -49,7 +49,8 @@ X_ADA_CFLAGS=@x_ada_cflags@
ALL_ADA_CFLAGS=$(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS)
# For finding the GCC build dir, which is used far too much
-GCC_DIR=../../$(HOST_SUBDIR)/gcc
+host_subdir = @host_subdir@
+GCC_DIR=../../$(host_subdir)/gcc
# Include fragment generated by GCC configure.
include $(GCC_DIR)/libada-mk