Provide a default value of $(toolexeclibdir) for $(ADA_RTL_DSO_DIR), so
that in a `--disable-libada' configuration `make install' places shared
gnatlib libraries, built with `make -C gcc gnatlib-shared', in their
intended version-specific location, fixing a commit r276424 ("libada:
Respect `--enable-version-specific-runtime-libs'") regression.
gcc/ada/
* gcc-interface/Makefile.in (toolexeclibdir): New variable.
---
On Fri, 20 Dec 2019, Eric Botcazou wrote:
> > I have rebuilt GCC with `--disable-libada' and it didn't cause any
> > anomalies I could notice whether `--enable-version-specific-runtime-libs'
> > or `--disable-version-specific-runtime-libs' has been used. I wouldn't
> > expect any anyway, as shared libgnat and libgnarl libraries are not built
> > in this case, so $(toolexeclibdir) is not supposed to be used.
>
> Yes, shared libraries are built with "make -C gcc gnatlib-shared gnattools".
Oops, I think it was missed in the original review.
Fixed thus, and verified with and without `--disable-libada', ensuring
that shared libgnat and libgnarl libraries arrive at their intended places
upon `make install'.
OK to apply?
Maciej
---
gcc/ada/gcc-interface/Makefile.in | 6 ++++++
1 file changed, 6 insertions(+)
gcc-ada-toolexeclibdir.diff
Index: gcc/gcc/ada/gcc-interface/Makefile.in
===================================================================
--- gcc.orig/gcc/ada/gcc-interface/Makefile.in
+++ gcc/gcc/ada/gcc-interface/Makefile.in
@@ -880,6 +880,12 @@ b_gnatm.o : b_gnatm.adb
$(CC) -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.
+# It will be overriden with the value configured when `gnat-install-lib'
+# is invoked through libada/.
+toolexeclibdir = $(ADA_RTL_OBJ_DIR)
+
ADA_INCLUDE_DIR = $(libsubdir)/adainclude
ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
ADA_RTL_DSO_DIR = $(toolexeclibdir)
