summaryrefslogtreecommitdiff
path: root/libphobos/src
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2018-11-02 08:29:50 +0000
committerIain Buclaw <ibuclaw@gcc.gnu.org>2018-11-02 08:29:50 +0000
commitac67752d795a9d1289c8e893946dc3b6b3a87057 (patch)
tree1f98a9b8ce84e824a3c1c8ca300bb0f43a4947cf /libphobos/src
parentdb281b40e41c622c548adbaeff72d9d2316fe006 (diff)
Fix libgphobos.spec in the wrong place with --enable-version-specific-runtime-libs
libphobos/ChangeLog: 2018-11-01 Iain Buclaw <ibuclaw@gdcproject.org> PR d/87827 * Makefile.in: Rebuild. * configure: Rebuild. * configure.ac: Properly set MULTISUBDIR. * d_rules.am: Set toolexecdir and toolexeclibdir. * libdruntime/Makefile.in: Rebuild. * m4/druntime.m4 (DRUNTIME_INSTALL_DIRECTORIES): Add --enable-version-specific-runtime-libs. * src/Makefile.in: Rebuild. * testsuite/Makefile.in: Rebuild. From-SVN: r265742
Diffstat (limited to 'libphobos/src')
-rw-r--r--libphobos/src/Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in
index 23ba19a1123..1e2003436eb 100644
--- a/libphobos/src/Makefile.in
+++ b/libphobos/src/Makefile.in
@@ -603,6 +603,8 @@ libdir = @libdir@
libexecdir = @libexecdir@
libphobos_builddir = @libphobos_builddir@
libphobos_srcdir = @libphobos_srcdir@
+libphobos_toolexecdir = @libphobos_toolexecdir@
+libphobos_toolexeclibdir = @libphobos_toolexeclibdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
@@ -615,6 +617,7 @@ phobos_compiler_shared_flag = @phobos_compiler_shared_flag@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -624,8 +627,6 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-toolexecdir = @toolexecdir@
-toolexeclibdir = @toolexeclibdir@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -633,6 +634,8 @@ top_srcdir = @top_srcdir@
# If there are no sources with known extension (i.e. only D sources)
# automake forgets to set this
CCLD = $(CC)
+toolexecdir = $(libphobos_toolexecdir)
+toolexeclibdir = $(libphobos_toolexeclibdir)
LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(GDC) $(AM_DFLAGS)