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 /gcc | |
| parent | d5dc6badbfe9439f50fb805bc34efc85bb52c6c1 (diff) | |
| download | gcc-5305be7e843ebbc376a8c591a3b382d103a5ee1e.zip gcc-5305be7e843ebbc376a8c591a3b382d103a5ee1e.tar.gz gcc-5305be7e843ebbc376a8c591a3b382d103a5ee1e.tar.bz2 | |
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 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/ada/Make-lang.in | 17 | ||||
| -rw-r--r-- | gcc/ada/Makefile.in | 1 |
3 files changed, 17 insertions, 10 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index af2d893..2af5c34 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2007-01-23 Richard Guenther <rguenther@suse.de> + + PR bootstrap/30541 + * 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. + 2007-01-08 Richard Guenther <rguenther@suse.de> * cuintp.c (build_cst_from_int): Use built_int_cst_type. diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in index 2774456..67cb84b 100644 --- a/gcc/ada/Make-lang.in +++ b/gcc/ada/Make-lang.in @@ -54,7 +54,6 @@ ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS) ADA_INCLUDES = -I- -I. -Iada -I$(srcdir)/ada ADA_INCLUDE_DIR = $(libsubdir)/adainclude ADA_RTL_OBJ_DIR = $(libsubdir)/adalib -GNATBIND = $(STAGE_PREFIX)gnatbind ADA_FLAGS_TO_PASS = \ "ADA_FOR_BUILD=$(ADA_FOR_BUILD)" \ "ADA_INCLUDE_DIR=$(ADA_INCLUDE_DIR)" \ @@ -384,7 +383,7 @@ ada.tags: force ada/doctools/xgnatugn$(build_exeext): ada/xgnatugn.adb -$(MKDIR) ada/doctools $(CP) $^ ada/doctools - cd ada/doctools && gnatmake -q xgnatugn + cd ada/doctools && $(GNATMAKE) -q xgnatugn # Note that gnat_ugn_unw.texi does not depend on xgnatugn # being built so we can distribute a pregenerated gnat_ugn_unw.info @@ -864,7 +863,7 @@ gnatboot2: force CFLAGS="$(BOOT_CFLAGS)" \ ADAFLAGS="$(BOOT_ADAFLAGS)"\ LDFLAGS="$(BOOT_LDFLAGS)" \ - STAGE_PREFIX=../stage1/ + GNATBIND="../stage1/gnatbind" $(MAKE) gnatboot3 BOOT_CFLAGS="$(BOOT_CFLAGS)" \ BOOT_ADAFLAGS="$(BOOT_ADAFLAGS)" \ LDFLAGS="$(BOOT_LDFLAGS)" @@ -875,7 +874,7 @@ gnatboot3: CFLAGS="$(BOOT_CFLAGS)" \ ADAFLAGS="$(BOOT_ADAFLAGS)"\ LDFLAGS="$(BOOT_LDFLAGS)" \ - STAGE_PREFIX=../stage2/ + GNATBIND="../stage2/gnatbind" gnatstage1: force -$(MKDIR) stage1 @@ -915,27 +914,27 @@ ada/b_gnatb.o : ada/b_gnatb.c ada/treeprs.ads : ada/treeprs.adt ada/sinfo.ads ada/xtreeprs.adb -$(MKDIR) ada/bldtools/treeprs $(CP) $^ ada/bldtools/treeprs - (cd ada/bldtools/treeprs; gnatmake -q xtreeprs ; ./xtreeprs ../../treeprs.ads ) + (cd ada/bldtools/treeprs; $(GNATMAKE) -q xtreeprs ; ./xtreeprs ../../treeprs.ads ) ada/einfo.h : ada/einfo.ads ada/einfo.adb ada/xeinfo.adb -$(MKDIR) ada/bldtools/einfo $(CP) $^ ada/bldtools/einfo - (cd ada/bldtools/einfo; gnatmake -q xeinfo ; ./xeinfo ../../einfo.h ) + (cd ada/bldtools/einfo; $(GNATMAKE) -q xeinfo ; ./xeinfo ../../einfo.h ) ada/sinfo.h : ada/sinfo.ads ada/xsinfo.adb -$(MKDIR) ada/bldtools/sinfo $(CP) $^ ada/bldtools/sinfo - (cd ada/bldtools/sinfo; gnatmake -q xsinfo ; ./xsinfo ../../sinfo.h ) + (cd ada/bldtools/sinfo; $(GNATMAKE) -q xsinfo ; ./xsinfo ../../sinfo.h ) ada/nmake.adb : ada/sinfo.ads ada/nmake.adt ada/xnmake.adb -$(MKDIR) ada/bldtools/nmake_b $(CP) $^ ada/bldtools/nmake_b - (cd ada/bldtools/nmake_b; gnatmake -q xnmake ; ./xnmake -b ../../nmake.adb ) + (cd ada/bldtools/nmake_b; $(GNATMAKE) -q xnmake ; ./xnmake -b ../../nmake.adb ) ada/nmake.ads : ada/sinfo.ads ada/nmake.adt ada/xnmake.adb ada/nmake.adb -$(MKDIR) ada/bldtools/nmake_s $(CP) $^ ada/bldtools/nmake_s - (cd ada/bldtools/nmake_s; gnatmake -q xnmake ; ./xnmake -s ../../nmake.ads ) + (cd ada/bldtools/nmake_s; $(GNATMAKE) -q xnmake ; ./xnmake -s ../../nmake.ads ) update-sources : ada/treeprs.ads ada/einfo.h ada/sinfo.h ada/nmake.adb \ ada/nmake.ads diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index a0fb0ed..4e5c840 100644 --- a/gcc/ada/Makefile.in +++ b/gcc/ada/Makefile.in @@ -115,7 +115,6 @@ INSTALL_DATA_DATE = cp -p MAKEINFO = makeinfo TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf -GNATBIND = $(STAGE_PREFIX)gnatbind GNATBIND_FLAGS = -static -x ADA_CFLAGS = ADAFLAGS = -W -Wall -gnatpg -gnata |