From: Maciej W. Rozycki <macro@wdc.com>
Date: Sun, 22 Dec 2019 00:15:44 +0000 (+0000)
Subject: libada: Fix shared library installation with `--disable-libada'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5cb34da7d90d526ef0b4f88b9de7c4d78c327b32;p=gcc.git

libada: Fix shared library installation with `--disable-libada'

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.

From-SVN: r279702
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index bfc838f48f2..5e92f1ac2e0 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2019-12-22  Maciej W. Rozycki  <macro@wdc.com>
+
+	* gcc-interface/Makefile.in (toolexeclibdir): New variable.
+
 2019-12-18  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gcc-interface/trans.c (Pragma_to_gnu) <Pragma_Warnings>: Push a
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 8deffb6eb36..3342e33b4b1 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/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 overridden 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)