https://gcc.gnu.org/g:9d4614a7e6dfa0af48f72d93d5c24dd8e5b17b3e
commit 9d4614a7e6dfa0af48f72d93d5c24dd8e5b17b3e Author: Alexandre Oliva <[email protected]> Date: Wed Nov 4 02:44:05 2026 -0300 introduce ADAC as Ada compiler Diff: --- Makefile.in | 4 ++++ Makefile.tpl | 4 ++++ config/acx.m4 | 6 ++++-- configure | 9 ++++++--- gcc/Makefile.in | 1 + gcc/ada/gcc-interface/Make-lang.in | 24 ++++++++++++++---------- gcc/ada/gcc-interface/Makefile.in | 34 ++++++++++++++++++---------------- gcc/doc/install.texi | 5 +++++ gnattools/Makefile.in | 4 ++++ libada/Makefile.in | 1 + 10 files changed, 61 insertions(+), 31 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0cd434249871..d6a35d36b880 100644 --- a/Makefile.in +++ b/Makefile.in @@ -455,6 +455,8 @@ A68 = @A68@ GDC = @GDC@ GNATBIND = @GNATBIND@ GNATMAKE = @GNATMAKE@ +# ADAC is only used by gcc, in stage1 and in nonbootstrap builds. +ADAC = @ADAC@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ @@ -1061,6 +1063,7 @@ FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) # Flags to pass to stage1 or when not bootstrapping. STAGE1_FLAGS_TO_PASS = \ + ADAC="$(ADAC)" \ LDFLAGS="$${LDFLAGS}" \ HOST_LIBS="$${HOST_LIBS}" @@ -1072,6 +1075,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \ A68="$${A68}" A68_FOR_BUILD="$${A68_FOR_BUILD}" \ GDC="$${GDC}" GDC_FOR_BUILD="$${GDC_FOR_BUILD}" \ GM2="$${GM2}" GM2_FOR_BUILD="$${GM2_FOR_BUILD}" \ + ADAC="$${CC}" \ GNATBIND="$${GNATBIND}" \ LDFLAGS="$${LDFLAGS}" \ HOST_LIBS="$${HOST_LIBS}" \ diff --git a/Makefile.tpl b/Makefile.tpl index 5509c6baf7f9..b2475cb7f1f3 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -458,6 +458,8 @@ A68 = @A68@ GDC = @GDC@ GNATBIND = @GNATBIND@ GNATMAKE = @GNATMAKE@ +# ADAC is only used by gcc, in stage1 and in nonbootstrap builds. +ADAC = @ADAC@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ @@ -785,6 +787,7 @@ FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) # Flags to pass to stage1 or when not bootstrapping. STAGE1_FLAGS_TO_PASS = \ + ADAC="$(ADAC)" \ LDFLAGS="$${LDFLAGS}" \ HOST_LIBS="$${HOST_LIBS}" @@ -796,6 +799,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \ A68="$${A68}" A68_FOR_BUILD="$${A68_FOR_BUILD}" \ GDC="$${GDC}" GDC_FOR_BUILD="$${GDC_FOR_BUILD}" \ GM2="$${GM2}" GM2_FOR_BUILD="$${GM2_FOR_BUILD}" \ + ADAC="$${CC}" \ GNATBIND="$${GNATBIND}" \ LDFLAGS="$${LDFLAGS}" \ HOST_LIBS="$${HOST_LIBS}" \ diff --git a/config/acx.m4 b/config/acx.m4 index 3a9a36a2cab4..f2d050ad25e1 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -397,7 +397,9 @@ AC_DEFUN([ACX_PROG_GNAT], [AC_REQUIRE([AC_PROG_CC]) AC_CHECK_TOOL(GNATBIND, gnatbind, no) AC_CHECK_TOOL(GNATMAKE, gnatmake, no) -AC_CACHE_CHECK([whether compiler driver understands Ada and is recent enough], +test x"$ADAC" != x || ADAC=$CC +AC_SUBST(ADAC) +AC_CACHE_CHECK([whether $ADAC understands Ada and is recent enough], acx_cv_cc_gcc_supports_ada, [cat >conftest.adb <<EOF pragma Warnings (Off); @@ -415,7 +417,7 @@ acx_cv_cc_gcc_supports_ada=no # Other compilers, like HP Tru64 UNIX cc, exit successfully when # given a .adb file, but produce no object file. So we must check # if an object file was really produced to guard against this. -errors=`(${CC} $1[]m4_ifval([$1], [ ])-c conftest.adb) 2>&1 || echo failure` +errors=`(${ADAC} $1[]m4_ifval([$1], [ ])-c conftest.adb) 2>&1 || echo failure` if test x"$errors" = x && test -f conftest.$ac_objext; then acx_cv_cc_gcc_supports_ada=yes fi diff --git a/configure b/configure index 109913f5d852..78cffacd9bee 100755 --- a/configure +++ b/configure @@ -732,6 +732,7 @@ do_compare CARGO GDC A68 +ADAC GNATMAKE GNATBIND ac_ct_CXX @@ -5837,8 +5838,10 @@ else GNATMAKE="$ac_cv_prog_GNATMAKE" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler driver understands Ada and is recent enough" >&5 -$as_echo_n "checking whether compiler driver understands Ada and is recent enough... " >&6; } +test x"$ADAC" != x || ADAC=$CC + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $ADAC understands Ada and is recent enough" >&5 +$as_echo_n "checking whether $ADAC understands Ada and is recent enough... " >&6; } if ${acx_cv_cc_gcc_supports_ada+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5858,7 +5861,7 @@ acx_cv_cc_gcc_supports_ada=no # Other compilers, like HP Tru64 UNIX cc, exit successfully when # given a .adb file, but produce no object file. So we must check # if an object file was really produced to guard against this. -errors=`(${CC} -c conftest.adb) 2>&1 || echo failure` +errors=`(${ADAC} -c conftest.adb) 2>&1 || echo failure` if test x"$errors" = x && test -f conftest.$ac_objext; then acx_cv_cc_gcc_supports_ada=yes fi diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 19e35f6149b8..8fa0b552509c 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -272,6 +272,7 @@ CPPFLAGS = @CPPFLAGS@ AWK = @AWK@ CC = @CC@ +ADAC = $(CC) CXX = @CXX@ BISON = @BISON@ BISONFLAGS = diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 1a8bb673871f..d81bd2aee39f 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -88,7 +88,7 @@ endif ifeq ($(STAGE1),True) ADA_INCLUDES=$(COMMON_ADA_INCLUDES) - adalib=$(dir $(shell $(CC) -print-libgcc-file-name))adalib + adalib=$(dir $(shell $(ADAC) -print-libgcc-file-name))adalib GNATLIB=$(adalib)/$(if $(wildcard $(adalib)/libgnat.a),libgnat.a,libgnat.so) $(STAGE1_LIBS) else ADA_INCLUDES=-nostdinc $(COMMON_ADA_INCLUDES) -Iada/libgnat -I$(srcdir)/ada/libgnat -Iada/gcc-interface -I$(srcdir)/ada/gcc-interface @@ -161,12 +161,12 @@ endif .adb.o: mkdir -p $(dir $@) - $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION) + $(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION) @$(ADA_DEPS) .ads.o: mkdir -p $(dir $@) - $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION) + $(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION) @$(ADA_DEPS) # Define the names for selecting Ada in LANGUAGES. @@ -205,6 +205,7 @@ ifeq ($(build), $(host)) # This is a regular native. Use the compiler from our # current build tree. ADA_TOOLS_FLAGS_TO_PASS=\ + ADAC="../../xgcc -B../../" \ CC="../../xgcc -B../../" \ CXX="$(CXX)" \ $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ @@ -223,6 +224,7 @@ ifeq ($(build), $(host)) endif ADA_TOOLS_FLAGS_TO_PASS=\ + ADAC="$(ADAC)" \ CC="$(CC)" \ CXX="$(CXX)" \ $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ @@ -242,6 +244,7 @@ else # This is a cross native. All the sources are taken from the currently # built runtime. ADA_TOOLS_FLAGS_TO_PASS=\ + ADAC="$(ADAC)" \ CC="$(CC)" \ CXX="$(CXX)" \ $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ @@ -257,6 +260,7 @@ else RTS_DIR:=$(strip $(subst \,/,$(shell $(GNATLS_FOR_HOST) -v | grep adalib ))) endif ADA_TOOLS_FLAGS_TO_PASS=\ + ADAC="$(ADAC)" \ CC="$(CC)" \ CXX="$(CXX)" \ $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ @@ -1188,7 +1192,7 @@ ada/b_gnat1.adb : $(GNAT1_ADA_OBJS) ada/b_gnat1.o : ada/b_gnat1.adb # Do not use ADAFLAGS to get rid of -gnatg which generates a lot # of style messages. - $(CC) -c $(CFLAGS) $(ADA_CFLAGS) $(PICFLAG) -gnatp -gnatws $(ADA_INCLUDES) \ + $(ADAC) -c $(CFLAGS) $(ADA_CFLAGS) $(PICFLAG) -gnatp -gnatws $(ADA_INCLUDES) \ $< $(ADA_OUTPUT_OPTION) ada/b_gnatb.adb : $(GNATBIND_OBJS) ada/gnatbind.o @@ -1197,7 +1201,7 @@ ada/b_gnatb.adb : $(GNATBIND_OBJS) ada/gnatbind.o $(MV) b_gnatb.adb b_gnatb.ads ada/ ada/b_gnatb.o : ada/b_gnatb.adb - $(CC) -c $(CFLAGS) $(ADA_CFLAGS) $(PICFLAG) -gnatp -gnatws $(ADA_INCLUDES) \ + $(ADAC) -c $(CFLAGS) $(ADA_CFLAGS) $(PICFLAG) -gnatp -gnatws $(ADA_INCLUDES) \ $< $(ADA_OUTPUT_OPTION) include $(srcdir)/ada/Make-generated.in @@ -1214,22 +1218,22 @@ ada/sdefault.o : ada/libgnat/ada.ads ada/libgnat/a-except.ads ada/libgnat/a-uncc # Special flags - see gcc-interface/Makefile.in for the template. ada/libgnat/a-except.o : ada/libgnat/a-except.adb ada/libgnat/a-except.ads ada/libgnat/s-excmac.ads ada/libgnat/s-excmac.adb - $(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O1 -fno-inline \ + $(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O1 -fno-inline \ $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION) @$(ADA_DEPS) ada/libgnat/s-excdeb.o : ada/libgnat/s-excdeb.adb ada/libgnat/s-excdeb.ads - $(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O0 \ + $(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) -O0 \ $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION) @$(ADA_DEPS) ada/libgnat/s-assert.o : ada/libgnat/s-assert.adb ada/libgnat/s-assert.ads - $(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) $(ADA_INCLUDES) \ + $(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) $(ADA_INCLUDES) \ $< $(ADA_OUTPUT_OPTION) @$(ADA_DEPS) ada/libgnat/a-tags.o : ada/libgnat/a-tags.adb ada/libgnat/a-tags.ads - $(CC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) $(ADA_INCLUDES) \ + $(ADAC) -c $(ALL_ADAFLAGS) $(FORCE_DEBUG_ADAFLAGS) $(ADA_INCLUDES) \ $< $(ADA_OUTPUT_OPTION) @$(ADA_DEPS) @@ -1248,7 +1252,7 @@ ada/generated/gnatvsn.ads: ada/gnatvsn.ads BASE-VER ada/GNAT_DATE cat $< | sed -e "/Version/s/(\([0-9]\{8\}\).*)/($$d$$s)/g" >$@ ada/gnatvsn.o : ada/gnatvsn.adb ada/generated/gnatvsn.ads - $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION) + $(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(ADA_OUTPUT_OPTION) @$(ADA_DEPS) # All generated files. Perhaps we should build all of these in the same diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index dd61ff04f965..d651d3442bfa 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -72,6 +72,7 @@ BOOT_CFLAGS = -O $(CFLAGS) T_CFLAGS = CC = cc +ADAC = $(CC) BISON = bison BISONFLAGS = ECHO = echo @@ -298,10 +299,10 @@ ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada $(CC) -c $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) .adb.o: - $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION) + $(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION) .ads.o: - $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION) + $(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) $< $(OUTPUT_OPTION) # how to regenerate this file Makefile: ../config.status $(srcdir)/ada/gcc-interface/Makefile.in $(srcdir)/ada/Makefile.in $(srcdir)/ada/version.c @@ -384,6 +385,7 @@ include $(fsrcdir)/ada/Makefile.rtl TOOLS_FLAGS_TO_PASS= \ "CC=$(CC)" \ + "ADAC=$(ADAC)" \ "CFLAGS=$(CFLAGS) $(PICFLAG)" \ "LDFLAGS=$(LDFLAGS) $(LD_PICFLAG)" \ "ADAFLAGS=$(ADAFLAGS)" \ @@ -468,40 +470,40 @@ common-tools: ../stamp-tools gnatchop gnatcmd gnatkr gnatls gnatprep gnatname \ gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS) $(GNATLINK) -v gnatcmd -o ../../gnat$(exeext) \ - --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ + --GCC="$(ADAC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) $(GNATLINK) -v gnatchop -o ../../gnatchop$(exeext) \ - --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ + --GCC="$(ADAC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) $(GNATLINK) -v gnatkr -o ../../gnatkr$(exeext) \ - --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ + --GCC="$(ADAC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) $(GNATLINK) -v gnatls -o ../../gnatls$(exeext) \ - --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ + --GCC="$(ADAC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) $(GNATLINK) -v gnatprep -o ../../gnatprep$(exeext) \ - --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ + --GCC="$(ADAC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) $(GNATLINK) -v gnatname -o ../../gnatname$(exeext) \ - --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ + --GCC="$(ADAC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) $(GNATLINK) -v gnatclean -o ../../gnatclean$(exeext) \ - --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ + --GCC="$(ADAC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) ../../gnatdll$(exeext): ../stamp-tools - $(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)" + $(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(ADAC) $(ALL_ADAFLAGS)" $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatdll $(GNATLINK) -v gnatdll -o $@ \ --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) gnatmake-re: ../stamp-tools - $(GNATMAKE) -j0 $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(ALL_ADAFLAGS)" - $(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)" + $(GNATMAKE) -j0 $(ADA_INCLUDES) -u sdefault --GCC="$(ADAC) $(ALL_ADAFLAGS)" + $(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatmake --GCC="$(ADAC) $(ALL_ADAFLAGS)" $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake $(GNATLINK) -v gnatmake -o ../../gnatmake$(exeext) \ - --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ + --GCC="$(ADAC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) # Note the use of the "mv" command in order to allow gnatlink to be linked @@ -512,7 +514,7 @@ gnatlink-re: ../stamp-tools gnatmake-re $(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)" $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink $(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \ - --GCC="$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ + --GCC="$(ADAC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ADA_INCLUDES)" \ --LINK="$(GCC_LINK)" $(TOOLS_LIBS) $(MV) ../../gnatlinknew$(exeext) ../../gnatlink$(exeext) @@ -884,13 +886,13 @@ b_gnatl.adb : $(GNATLINK_OBJS) $(GNATBIND) $(ADA_INCLUDES) -o b_gnatl.adb gnatlink.ali b_gnatl.o : b_gnatl.adb - $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) -gnatws -gnatyN $< $(OUTPUT_OPTION) + $(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) -gnatws -gnatyN $< $(OUTPUT_OPTION) b_gnatm.adb : $(GNATMAKE_OBJS) $(GNATBIND) $(ADA_INCLUDES) -o b_gnatm.adb gnatmake.ali b_gnatm.o : b_gnatm.adb - $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) -gnatws -gnatyN $< $(OUTPUT_OPTION) + $(ADAC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) -gnatws -gnatyN $< $(OUTPUT_OPTION) # Provide a `toolexeclibdir' definition for when `gnat-install-lib' is # wired through gcc/ in a configuration with top-level libada disabled. diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 840e6553db6e..26c7f19913ad 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -270,6 +270,11 @@ This includes GNAT tools such as @command{gnatmake} and @command{gnatlink}, since the Ada front end is written in Ada and uses some GNAT-specific extensions. +You may set the @env{ADAC} environment variable to use a compiler driver +other than @env{CC} to compile the Ada (stage1, if bootstrapping) front +end. @env{GNATMAKE} and @env{GNATBIND} environment variables may need to +be set as well. + In order to build a cross compiler, it is strongly recommended to install the new compiler as native first, and then use it to build the cross compiler. Other native compiler versions may work but this is not guaranteed and diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in index 47b476ec52f6..a7bf278dcc2d 100644 --- a/gnattools/Makefile.in +++ b/gnattools/Makefile.in @@ -35,6 +35,7 @@ LN_S=@LN_S@ target_noncanonical=@target_noncanonical@ GNATMAKE=@GNATMAKE@ GNATBIND=@GNATBIND@ +ADAC=$(CC) # Variables for the user (or the top level) to override. exeext = @EXEEXT@ @@ -79,6 +80,7 @@ CXX_LFLAGS = \ # Variables for gnattools, native TOOLS_FLAGS_TO_PASS_NATIVE= \ + "ADAC=../../xgcc -B../../" \ "CC=../../xgcc -B../../" \ "CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS) $(PICFLAG)" \ @@ -97,6 +99,7 @@ TOOLS_FLAGS_TO_PASS_NATIVE= \ # Variables for regnattools TOOLS_FLAGS_TO_PASS_RE= \ + "ADAC=../../xgcc -B../../" \ "CC=../../xgcc -B../../" \ "CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS) $(PICFLAG)" \ @@ -125,6 +128,7 @@ GNATLS_FOR_HOST = $(subst gnatmake,gnatls,$(GNATMAKE)) RTS_DIR:=$(strip $(subst \,/,$(shell $(GNATLS_FOR_HOST) -v | grep adalib ))) TOOLS_FLAGS_TO_PASS_CROSS= \ + "ADAC=$(ADAC)" \ "CC=$(CC)" \ "CXX=$(CXX)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS) $(PICFLAG)" \ diff --git a/libada/Makefile.in b/libada/Makefile.in index 044935859500..6c833f8d3794 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -95,6 +95,7 @@ LIBADA_FLAGS_TO_PASS = \ "prefix=$(prefix)" \ "exeext=.exeext.should.not.be.used " \ 'CC=the.host.compiler.should.not.be.needed' \ + 'ADAC=the.host.compiler.should.not.be.needed' \ "GCC_FOR_TARGET=$(CC)" \ "CFLAGS=$(CFLAGS)"
