===================================================================
@@ -1705,6 +1705,10 @@ $(FULL_DRIVER_NAME): ./xgcc
# language hooks, generated by configure
@language_hooks@
+# Wire in install-gnatlib invocation with `make install' for a configuration
+# with top-level libada disabled.
+gnat_install_lib = @gnat_install_lib@
+
# per-language makefile fragments
ifneq ($(LANG_MAKEFRAGS),)
include $(LANG_MAKEFRAGS)
===================================================================
@@ -822,7 +822,9 @@ doc/gnat-style.pdf: ada/gnat-style.texi
# gnatlink, gnatls, gnatmake, gnatname, gnatprep, gnatxref, gnatfind,
# gnatclean).
# gnatdll is only used on Windows.
-ada.install-common:
+ada.install-common: $(gnat_install_lib) gnat-install-tools
+
+gnat-install-tools:
$(MKDIR) $(DESTDIR)$(bindir)
-if [ -f gnat1$(exeext) ] ; \
then \
@@ -843,6 +845,7 @@ doc/gnat-style.pdf: ada/gnat-style.texi
#
# Finally, install the library
#
+gnat-install-lib: gnat-install-tools
-if [ -f gnat1$(exeext) ] ; \
then \
$(MAKE) $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib; \
===================================================================
@@ -814,6 +814,7 @@ SET_MAKE
accel_dir_suffix
real_target_noncanonical
enable_as_accelerator
+gnat_install_lib
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
@@ -7826,6 +7827,16 @@ else
fi
+# If top-level libada has been disabled, then wire in install-gnatlib
+# invocation with `make install', so that one can build and install
+# the library manually with `make -C gcc all gnatlib gnattools install'.
+if test x"$enable_libada" = xno; then
+ gnat_install_lib=gnat-install-lib
+else
+ gnat_install_lib=
+fi
+
+
if test x"$enable_as_accelerator_for" != x; then
$as_echo "#define ACCEL_COMPILER 1" >>confdefs.h
@@ -18819,7 +18830,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18822 "configure"
+#line 18833 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18925,7 +18936,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18928 "configure"
+#line 18939 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
===================================================================
@@ -982,6 +982,16 @@ AC_ARG_ENABLE(languages,
esac],
[enable_languages=c])
+# If top-level libada has been disabled, then wire in install-gnatlib
+# invocation with `make install', so that one can build and install
+# the library manually with `make -C gcc all gnatlib gnattools install'.
+if test x"$enable_libada" = xno; then
+ gnat_install_lib=gnat-install-lib
+else
+ gnat_install_lib=
+fi
+AC_SUBST(gnat_install_lib)
+
if test x"$enable_as_accelerator_for" != x; then
AC_DEFINE(ACCEL_COMPILER, 1,
[Define if this compiler should be built as the offload target compiler.])