[PATCH] Fix 'quickstrap' target for Ada

[PATCH] Fix 'quickstrap' target for Ada

[Eric Botcazou]

[-- Attachment #1: Type: text/plain, Size: 437 bytes --]

It fails if Ada front-end files are modified because GNATBIND is set to the 
stage #1 gnatbind and the ALI files are generally not compatible.

Bootstrapped and quickstrapped on i586-suse-linux, OK for mainline?


2009-04-24  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.


-- 
Eric Botcazou

[-- Attachment #2: p.diff --]
[-- Type: text/x-diff, Size: 1799 bytes --]

Index: Makefile.tpl
===================================================================
--- Makefile.tpl	(revision 146679)
+++ Makefile.tpl	(working copy)
@@ -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=/'`"
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 146679)
+++ Makefile.in	(working copy)
@@ -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=/'`"
 

Re: [PATCH] Fix 'quickstrap' target for Ada

[Dave Korn]

Eric Botcazou wrote:
> It fails if Ada front-end files are modified because GNATBIND is set to the 
> stage #1 gnatbind and the ALI files are generally not compatible.

  I'll bet this is why I had so much trouble bootstrapping my way past an ABI
change!  Thanks for fixing this, Eric.

    cheers,
      DaveK

Re: [PATCH] Fix 'quickstrap' target for Ada

[Paolo Bonzini]

Eric Botcazou wrote:
> It fails if Ada front-end files are modified because GNATBIND is set to the 
> stage #1 gnatbind and the ALI files are generally not compatible.
> 
> Bootstrapped and quickstrapped on i586-suse-linux, OK for mainline?

Ok, thanks!

Paolo