procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Maciej W. Rozycki 2019-12-22 00:15:44 +00:00 • committed by Maciej W. Rozycki
parent b092fb3b67
commit 5cb34da7d9
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/ada/ChangeLog
View file

@ -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

6
gcc/ada/gcc-interface/Makefile.in
View file

@ -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)