Based on http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55946 --- gcc-4.8.1/libada/configure.orig +++ gcc-4.8.1/libada/configure @@ -2951,9 +2951,7 @@ # Determine what to build for 'gnatlib' -if test $build = $target \ - && test ${enable_shared} = yes ; then - # Note that build=target is almost certainly the wrong test; FIXME +if test ${enable_shared} = yes ; then default_gnatlib_target="gnatlib-shared" else default_gnatlib_target="gnatlib-plain" --- gcc-4.8.1/gcc/ada/gcc-interface/Make-lang.in.orig +++ gcc-4.8.1/gcc/ada/gcc-interface/Make-lang.in @@ -625,7 +625,7 @@ 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 doc/gnat_ugn.texi and doc/projects.texi do not depend on # xgnatugn being built so we can distribute a pregenerated doc/gnat_ugn.info --- gcc-4.8.1/gnattools/Makefile.in.orig +++ gcc-4.8.1/gnattools/Makefile.in @@ -32,6 +32,8 @@ # Nonstandard autoconf-set variables. LN_S=@LN_S@ target_noncanonical=@target_noncanonical@ +build=@build@ +host=@host@ # Variables for the user (or the top level) to override. exeext = @EXEEXT@ @@ -183,7 +185,11 @@ # put the host RTS dir first in the PATH to hide the default runtime # files that are among the sources # FIXME: This should be done in configure. +ifeq ($(host), $(build)) RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib ))) +else +RTS_DIR:=$(strip $(subst \,/,$(shell $(host)-gnatls -v | grep adalib ))) +endif gnattools-cross: $(GCC_DIR)/stamp-tools # gnattools1-re $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \