* Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Add GNATBIND.

	(POSTSTAGE1_FLAGS_TO_PASS): Pick up exported value for GNATBIND.
	* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index e7fce8cc13cc3e37ae315ddadc9f1cca0aa7184d..0f086f4341018a936bfdd9ee4630f2e17eeb8373 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-25  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * 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  <eliz@gnu.org>
 
        * config.guess (pc:*:*:*): Return i586-pc-msdosdjgpp, for

diff --git a/Makefile.in b/Makefile.in
index de33e1130a0b6e04513fb75f36ef0ea09b90fde1..ee16fc1099257d0bba7d1f748eb2a90b5ca8fff3 100644 (file)
--- 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 1de3b0605cf60bf69c00d8c1f8ed01059c5305be..ad1400ebf7abf9f7b899d3fa571ac2b48fb1dcd6 100644 (file)
--- 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=/'`"