diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2023-03-06 11:36:19 +0100 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@adacore.com> | 2023-03-06 11:40:04 +0100 |
| commit | 94a67e3044212592ce408952c526210a81e1bf49 (patch) | |
| tree | 92ad9226cae1ec84b822f6146cc0fc52dcba7ed1 | |
| parent | c1873079b05e399355eb79e4828ed9ba2d0c6968 (diff) | |
| download | gcc-94a67e3044212592ce408952c526210a81e1bf49.zip gcc-94a67e3044212592ce408952c526210a81e1bf49.tar.gz gcc-94a67e3044212592ce408952c526210a81e1bf49.tar.bz2 | |
Revert "Respect GNATMAKE Makefile variable" commit
It breaks cross native builds.
gcc/ada/
PR ada/108909
PR ada/108983
* Make-generated.in: Do not use GNATMAKE.
* gcc-interface/Makefile.in: Ditto.
| -rw-r--r-- | gcc/ada/Make-generated.in | 6 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ada/Make-generated.in b/gcc/ada/Make-generated.in index 34c86b2..948fc50 100644 --- a/gcc/ada/Make-generated.in +++ b/gcc/ada/Make-generated.in @@ -18,7 +18,7 @@ GEN_IL_FLAGS = -gnata -gnat2012 -gnatw.g -gnatyg -gnatU $(GEN_IL_INCLUDES) ada/seinfo_tables.ads ada/seinfo_tables.adb ada/sinfo.h ada/einfo.h ada/nmake.ads ada/nmake.adb ada/seinfo.ads ada/sinfo-nodes.ads ada/sinfo-nodes.adb ada/einfo-entities.ads ada/einfo-entities.adb: ada/stamp-gen_il ; @true ada/stamp-gen_il: $(fsrcdir)/ada/gen_il* $(MKDIR) ada/gen_il - cd ada/gen_il; $(GNATMAKE) -q -g $(GEN_IL_FLAGS) gen_il-main + cd ada/gen_il; gnatmake -q -g $(GEN_IL_FLAGS) gen_il-main # Ignore errors to work around finalization issues in older compilers - cd ada/gen_il; ./gen_il-main $(fsrcdir)/../move-if-change ada/gen_il/seinfo_tables.ads ada/seinfo_tables.ads @@ -39,14 +39,14 @@ ada/stamp-gen_il: $(fsrcdir)/ada/gen_il* # would cause bootstrapping with older compilers to fail. You can call it by # hand, as a sanity check that these files are legal. ada/seinfo_tables.o: ada/seinfo_tables.ads ada/seinfo_tables.adb - cd ada ; $(GNATMAKE) $(GEN_IL_INCLUDES) seinfo_tables.adb -gnatU -gnatX + cd ada ; gnatmake $(GEN_IL_INCLUDES) seinfo_tables.adb -gnatU -gnatX ada/snames.h ada/snames.ads ada/snames.adb : ada/stamp-snames ; @true ada/stamp-snames : ada/snames.ads-tmpl ada/snames.adb-tmpl ada/snames.h-tmpl ada/xsnamest.adb ada/xutil.ads ada/xutil.adb -$(MKDIR) ada/bldtools/snamest $(RM) $(addprefix ada/bldtools/snamest/,$(notdir $^)) $(CP) $^ ada/bldtools/snamest - cd ada/bldtools/snamest; $(GNATMAKE) -q xsnamest ; ./xsnamest + cd ada/bldtools/snamest; gnatmake -q xsnamest ; ./xsnamest $(fsrcdir)/../move-if-change ada/bldtools/snamest/snames.ns ada/snames.ads $(fsrcdir)/../move-if-change ada/bldtools/snamest/snames.nb ada/snames.adb $(fsrcdir)/../move-if-change ada/bldtools/snamest/snames.nh ada/snames.h diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index c8c38ac..da6a56f 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -616,7 +616,7 @@ OSCONS_EXTRACT=$(GCC_FOR_ADA_RTS) $(GNATLIBCFLAGS_FOR_C) -S s-oscons-tmplt.i -$(MKDIR) ./bldtools/oscons $(RM) $(addprefix ./bldtools/oscons/,$(notdir $^)) $(CP) $^ ./bldtools/oscons - (cd ./bldtools/oscons ; $(GNATMAKE) -q xoscons) + (cd ./bldtools/oscons ; gnatmake -q xoscons) $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) s-oscons-tmplt.c gsocket.h ./bldtools/oscons/xoscons $(RM) $(RTSDIR)/s-oscons-tmplt.i $(RTSDIR)/s-oscons-tmplt.s |