From 2addcd08303a6bb58b856746a20f495e51ae39b7 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Sat, 25 Apr 2009 12:25:01 +0000 Subject: [PATCH] * Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Add GNATBIND. (POSTSTAGE1_FLAGS_TO_PASS): Pick up exported value for GNATBIND. * Makefile.in: Regenerate. --- ChangeLog | 6 ++++++ Makefile.in | 4 ++-- Makefile.tpl | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7fce8cc1..0f086f434 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 Eli Zaretskii * config.guess (pc:*:*:*): Return i586-pc-msdosdjgpp, for diff --git a/Makefile.in b/Makefile.in index de33e1130..ee16fc109 100644 --- a/Makefile.in +++ b/Makefile.in @@ -214,6 +214,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: @@ -624,8 +625,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 1de3b0605..ad1400ebf 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -217,6 +217,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: @@ -512,8 +513,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=/'`"