aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in4
-rw-r--r--Makefile.tpl4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e7fce8c..0f086f4 100644
--- 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 de33e11..ee16fc1 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 1de3b06..ad1400e 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=/'`"