diff options
| author | Maciej W. Rozycki <macro@wdc.com> | 2019-12-22 00:15:44 +0000 |
|---|---|---|
| committer | Maciej W. Rozycki <macro@gcc.gnu.org> | 2019-12-22 00:15:44 +0000 |
| commit | 5cb34da7d90d526ef0b4f88b9de7c4d78c327b32 (patch) | |
| tree | 7a2dfbe5bec8f33999a75a7fd7d07430cf0df662 /gcc | |
| parent | b092fb3b67792d47400ce99b25c8abbf76d8ab5f (diff) | |
| download | gcc-5cb34da7d90d526ef0b4f88b9de7c4d78c327b32.zip gcc-5cb34da7d90d526ef0b4f88b9de7c4d78c327b32.tar.gz gcc-5cb34da7d90d526ef0b4f88b9de7c4d78c327b32.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index bfc838f..5e92f1a 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 8deffb6..3342e33 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) |