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

diff --git a/ChangeLog b/ChangeLog
index f25b9526b343ab245a21b3ae8aedb85d8995933a..8c04bc7da89572aec48d2a14095efd4aa755c715 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  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        PR bootstrap/39739
@@ -6,7 +12,7 @@
 
        * configure, Makefile.in: Regenerate.
 
-2009-04-21  Taras Glek <tglek@mozilla.com>
+2009-04-21  Taras Glek  <tglek@mozilla.com>
 
        * include/hashtab.h: Update GTY annotations to new syntax
        * include/splay-tree.h: Likewise

diff --git a/Makefile.in b/Makefile.in
index 1d893399e5d36ea5f3167c468cf9b98b209f26ed..238ed68c4cdc49371ec3c0cd4be3e774fc4ba818 100644 (file)
--- 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 adbf9eb577d0e52da582df6e4f0b5412ed21e8e9..dd2e1c1b0fd5a453b20b150a1f4037908f8f32a4 100644 (file)
--- 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=/'`"