diff options
author | Richard Guenther <rguenther@suse.de> | 2007-01-23 16:37:09 +0000 |
---|---|---|
committer | Richard Biener <rguenth@gcc.gnu.org> | 2007-01-23 16:37:09 +0000 |
commit | 5305be7e843ebbc376a8c591a3b382d103a5ee1e (patch) | |
tree | 5f70719b7af7ee93a93c643d7f80db9037b57ff2 /Makefile.tpl | |
parent | d5dc6badbfe9439f50fb805bc34efc85bb52c6c1 (diff) | |
download | gcc-5305be7e843ebbc376a8c591a3b382d103a5ee1e.tar.gz |
re PR bootstrap/30541 (Top-level should pass GNATBIND, GNATLINK and GNATMAKE variables down)
2007-01-23 Richard Guenther <rguenther@suse.de>
PR bootstrap/30541
* Makefile.def (flags_to_pass): Add GNATBIND and GNATMAKE.
* Makefile.tpl (GNATBIND): Substitute it.
(GNATMAKE): Likewise.
(POSTSTAGE1_FLAGS_TO_PASS): Pass staged GNATBIND instead
of STAGE_PREFIX.
* Makefile.in: Regenerate.
* configure: Regenerate.
config/
* acx.m4 (ACX_PROG_GNAT): Check for gnatmake.
libada/
* Makefile.in (STAGE_PREFIX): Do not define.
(FLAGS_TO_PASS): Do not pass STAGE_PREFIX.
gnattools/
* Makefile.in (STAGE_PREFIX): Do not define.
ada/
* Make-lang.in: Replace invocations of gnatmake with $(GNATMAKE).
(gnatboot2): Pass staged GNATMAKE instead of STAGE_PREFIX.
(gnatboot3): Likewise.
(GNATBIND): Do not define.
* Makefile.in (GNATBIND): Do not define.
From-SVN: r121082
Diffstat (limited to 'Makefile.tpl')
-rw-r--r-- | Makefile.tpl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 475b0d358e1..0d8ff7cee48 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -299,6 +299,9 @@ RANLIB = @RANLIB@ STRIP = @STRIP@ WINDRES = @WINDRES@ +GNATBIND = @GNATBIND@ +GNATMAKE = @GNATMAKE@ + CFLAGS = @CFLAGS@ LDFLAGS = LIBCFLAGS = $(CFLAGS) @@ -451,7 +454,7 @@ X11_FLAGS_TO_PASS = \ POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX="$$r/$(HOST_SUBDIR)/prev-gcc/" \ + GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \ CFLAGS="$(BOOT_CFLAGS)" \ LIBCFLAGS="$(BOOT_CFLAGS)" \ LDFLAGS="$(BOOT_LDFLAGS)" \ |