From a687f83c5ae302e0e1abff0af5992eeb02f510a7 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sat, 25 Apr 2009 12:24:08 +0000 Subject: [PATCH] Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Add GNATBIND. * Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Add GNATBIND. (POSTSTAGE1_FLAGS_TO_PASS): Pick up exported value for GNATBIND. * Makefile.in: Regenerate. From-SVN: r146769 --- ChangeLog | 8 +++++++- Makefile.in | 4 ++-- Makefile.tpl | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f25b9526b34..8c04bc7da89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-04-25 Eric Botcazou + + * Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Add GNATBIND. + (POSTSTAGE1_FLAGS_TO_PASS): Pick up exported value for GNATBIND. + * Makefile.in: Regenerate. + 2009-04-24 Kaveh R. Ghazi PR bootstrap/39739 @@ -6,7 +12,7 @@ * configure, Makefile.in: Regenerate. -2009-04-21 Taras Glek +2009-04-21 Taras Glek * include/hashtab.h: Update GTY annotations to new syntax * include/splay-tree.h: Likewise diff --git a/Makefile.in b/Makefile.in index 1d893399e5d..238ed68c4cd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -215,6 +215,7 @@ POSTSTAGE1_HOST_EXPORTS = \ $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \ + GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND \ LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS; # Target libraries are put under this directory: @@ -625,8 +626,7 @@ X11_FLAGS_TO_PASS = \ # Flags to pass to stage2 and later makes. POSTSTAGE1_FLAGS_TO_PASS = \ - CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \ + CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" GNATBIND="$${GNATBIND}" \ LDFLAGS="$(BOOT_LDFLAGS)" \ "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" diff --git a/Makefile.tpl b/Makefile.tpl index adbf9eb577d..dd2e1c1b0fd 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -218,6 +218,7 @@ POSTSTAGE1_HOST_EXPORTS = \ $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \ + GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND \ LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS; # Target libraries are put under this directory: @@ -513,8 +514,7 @@ X11_FLAGS_TO_PASS = \ # Flags to pass to stage2 and later makes. POSTSTAGE1_FLAGS_TO_PASS = \ - CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \ + CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" GNATBIND="$${GNATBIND}" \ LDFLAGS="$(BOOT_LDFLAGS)" \ "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"