Skip to content

R
riscv-gcc-1
Commit ac67752d by Iain Buclaw Committed by Iain Buclaw
Options

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
parent db281b40
Showing with 182 additions and 125 deletions
libphobos/ChangeLog
2018-11-02 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.
2018-10-31 Joseph Myers <joseph@codesourcery.com> 2018-10-31 Joseph Myers <joseph@codesourcery.com>
PR bootstrap/82856 PR bootstrap/82856
......
libphobos/Makefile.in
...@@ -306,6 +306,8 @@ libdir = @libdir@ ...@@ -306,6 +306,8 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libphobos_builddir = @libphobos_builddir@ libphobos_builddir = @libphobos_builddir@
libphobos_srcdir = @libphobos_srcdir@ libphobos_srcdir = @libphobos_srcdir@
libphobos_toolexecdir = @libphobos_toolexecdir@
libphobos_toolexeclibdir = @libphobos_toolexeclibdir@
localedir = @localedir@ localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
...@@ -318,6 +320,7 @@ phobos_compiler_shared_flag = @phobos_compiler_shared_flag@ ...@@ -318,6 +320,7 @@ phobos_compiler_shared_flag = @phobos_compiler_shared_flag@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
...@@ -327,8 +330,6 @@ target_alias = @target_alias@ ...@@ -327,8 +330,6 @@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
......
libphobos/configure.ac
...@@ -168,45 +168,31 @@ AC_SUBST(GDCFLAGSX) ...@@ -168,45 +168,31 @@ AC_SUBST(GDCFLAGSX)
AC_CHECK_HEADER(stdio.h,:, AC_CHECK_HEADER(stdio.h,:,
[AC_MSG_ERROR([cannot find stdio.h.])]) [AC_MSG_ERROR([cannot find stdio.h.])])
AC_CONFIG_FILES(Makefile src/Makefile libdruntime/Makefile testsuite/Makefile) AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(libdruntime/gcc/config.d libdruntime/gcc/libbacktrace.d) AC_CONFIG_FILES(libdruntime/gcc/config.d libdruntime/gcc/libbacktrace.d)
AC_CONFIG_FILES(src/libgphobos.spec) AC_CONFIG_FILES(src/libgphobos.spec)
AC_CONFIG_FILES([testsuite/testsuite_flags],[chmod +x testsuite/testsuite_flags]) AC_CONFIG_FILES([testsuite/testsuite_flags],[chmod +x testsuite/testsuite_flags])
# We need multilib support, but only if configuring for the target. # Multilibs need MULTISUBDIR defined correctly in certain makefiles so
AC_CONFIG_COMMANDS([default], # that multilib installs will end up installed in the correct place.
[if test -n "$CONFIG_FILES"; then # The testsuite needs it for multilib-aware ABI baseline files.
if test -n "${with_target_subdir}"; then # To work around this not being passed down from config-ml.in ->
# Multilibs need MULTISUBDIR defined correctly in certain makefiles so # srcdir/Makefile.am -> srcdir/{src,libdruntime,...}/Makefile.am, manually
# that multilib installs will end up installed in the correct place. # append it here. Only modify Makefiles that have just been created.
# The testsuite needs it for multilib-aware ABI baseline files. #
# To work around this not being passed down from config-ml.in -> # Also, get rid of this simulated-VPATH thing that automake does.
# srcdir/Makefile.am -> srcdir/{src,libdruntime,...}/Makefile.am, manually AC_CONFIG_FILES(AC_FOREACH([DIR], [libdruntime src testsuite], [DIR/Makefile ]),
# append it here. Only modify Makefiles that have just been created. [cat > vpsed$$ << \_EOF
# s!`test -f '$<' || echo '$(srcdir)/'`!!
# Also, get rid of this simulated-VPATH thing that automake does.
cat > vpsed << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF _EOF
for i in $SUBDIRS; do sed -f vpsed$$ $ac_file > tmp$$
case $CONFIG_FILES in mv tmp$$ $ac_file
*${i}/Makefile*) rm vpsed$$
#echo "Adding MULTISUBDIR to $i/Makefile" echo 'MULTISUBDIR =' >> $ac_file
sed -f vpsed $i/Makefile > tmp ml_norecursion=yes
grep '^MULTISUBDIR =' Makefile >> tmp . ${multi_basedir}/config-ml.in
mv tmp $i/Makefile AS_UNSET([ml_norecursion])
;;
esac
done
rm vpsed
fi
fi
],
[
# Variables needed in config.status (file generation) which aren't already
# passed by autoconf.
SUBDIRS="$SUBDIRS"
]) ])
AC_OUTPUT AC_OUTPUT
libphobos/d_rules.am
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
# automake forgets to set this # automake forgets to set this
CCLD = $(CC) CCLD = $(CC)
toolexecdir = $(libphobos_toolexecdir)
toolexeclibdir = $(libphobos_toolexeclibdir)
# Compile D into normal object files # Compile D into normal object files
.d.o: .d.o:
$(GDC) $(GDCFLAGS) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $< $(GDC) $(GDCFLAGS) $(MULTIFLAGS) $(D_EXTRA_DFLAGS) -c -o $@ $<
......
libphobos/libdruntime/Makefile.in
...@@ -643,6 +643,8 @@ libdir = @libdir@ ...@@ -643,6 +643,8 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libphobos_builddir = @libphobos_builddir@ libphobos_builddir = @libphobos_builddir@
libphobos_srcdir = @libphobos_srcdir@ libphobos_srcdir = @libphobos_srcdir@
libphobos_toolexecdir = @libphobos_toolexecdir@
libphobos_toolexeclibdir = @libphobos_toolexeclibdir@
localedir = @localedir@ localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
...@@ -655,6 +657,7 @@ phobos_compiler_shared_flag = @phobos_compiler_shared_flag@ ...@@ -655,6 +657,7 @@ phobos_compiler_shared_flag = @phobos_compiler_shared_flag@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
...@@ -664,8 +667,6 @@ target_alias = @target_alias@ ...@@ -664,8 +667,6 @@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
...@@ -673,6 +674,8 @@ top_srcdir = @top_srcdir@ ...@@ -673,6 +674,8 @@ top_srcdir = @top_srcdir@
# If there are no sources with known extension (i.e. only D sources) # If there are no sources with known extension (i.e. only D sources)
# automake forgets to set this # automake forgets to set this
CCLD = $(CC) CCLD = $(CC)
toolexecdir = $(libphobos_toolexecdir)
toolexeclibdir = $(libphobos_toolexeclibdir)
LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(GDC) $(AM_DFLAGS) --mode=compile $(GDC) $(AM_DFLAGS)
......
libphobos/m4/druntime.m4
...@@ -50,8 +50,8 @@ AC_DEFUN([DRUNTIME_MULTILIB], ...@@ -50,8 +50,8 @@ AC_DEFUN([DRUNTIME_MULTILIB],
# DRUNTIME_INSTALL_DIRECTORIES # DRUNTIME_INSTALL_DIRECTORIES
# ---------------------------- # ----------------------------
# Setup various install directories for headers. # Setup various install directories for headers.
# Add the cross-host option and substitute the toolexecdir # Add the cross-host option and substitute the libphobos_toolexecdir
# toolexeclibdir and gdc_include_dir variables. # libphobos_toolexeclibdir and gdc_include_dir variables.
AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES], AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
[ [
AC_REQUIRE([AC_PROG_GDC]) AC_REQUIRE([AC_PROG_GDC])
...@@ -65,33 +65,43 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES], ...@@ -65,33 +65,43 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
AC_HELP_STRING([--with-cross-host=HOST], AC_HELP_STRING([--with-cross-host=HOST],
[configuring with a cross compiler])) [configuring with a cross compiler]))
toolexecdir=no libphobos_toolexecdir=no
toolexeclibdir=no libphobos_toolexeclibdir=no
version_specific_libs=no AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
AC_ARG_ENABLE([version-specific-runtime-libs],
AC_HELP_STRING([--enable-version-specific-runtime-libs],
[Specify that runtime libraries should be installed in a compiler-specific directory]),
[case "$enableval" in
yes) version_specific_libs=yes ;;
no) version_specific_libs=no ;;
*) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);;
esac],
[version_specific_libs=no])
AC_MSG_RESULT($version_specific_libs)
# Version-specific runtime libs processing. # Version-specific runtime libs processing.
if test $version_specific_libs = yes; then if test $version_specific_libs = yes; then
toolexecdir='${libdir}/gcc/${host_alias}' libphobos_toolexecdir='${libdir}/gcc/${host_alias}'
toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)' libphobos_toolexeclibdir='${toolexecdir}/${gcc_version}$(MULTISUBDIR)'
else else
# Calculate toolexecdir, toolexeclibdir # Calculate libphobos_toolexecdir, libphobos_toolexeclibdir
# Install a library built with a cross compiler in tooldir, not libdir. # Install a library built with a cross compiler in tooldir, not libdir.
if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then
toolexecdir='${exec_prefix}/${host_alias}' libphobos_toolexecdir='${exec_prefix}/${host_alias}'
toolexeclibdir='${toolexecdir}/lib' libphobos_toolexeclibdir='${toolexecdir}/lib'
else else
toolexecdir='${libdir}/gcc/${host_alias}' libphobos_toolexecdir='${libdir}/gcc/${host_alias}'
toolexeclibdir='${libdir}' libphobos_toolexeclibdir='${libdir}'
fi fi
multi_os_directory=`$GDC -print-multi-os-directory` multi_os_directory=`$GDC -print-multi-os-directory`
case $multi_os_directory in case $multi_os_directory in
.) ;; # Avoid trailing /. .) ;; # Avoid trailing /.
*) toolexeclibdir=${toolexeclibdir}/${multi_os_directory} ;; *) libphobos_toolexeclibdir=${libphobos_toolexeclibdir}/${multi_os_directory} ;;
esac esac
fi fi
AC_SUBST(toolexecdir) AC_SUBST(libphobos_toolexecdir)
AC_SUBST(toolexeclibdir) AC_SUBST(libphobos_toolexeclibdir)
# Default case for install directory for D sources files. # Default case for install directory for D sources files.
gdc_include_dir='$(libdir)/gcc/${target_alias}/${gcc_version}/include/d' gdc_include_dir='$(libdir)/gcc/${target_alias}/${gcc_version}/include/d'
......
libphobos/src/Makefile.in
...@@ -603,6 +603,8 @@ libdir = @libdir@ ...@@ -603,6 +603,8 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libphobos_builddir = @libphobos_builddir@ libphobos_builddir = @libphobos_builddir@
libphobos_srcdir = @libphobos_srcdir@ libphobos_srcdir = @libphobos_srcdir@
libphobos_toolexecdir = @libphobos_toolexecdir@
libphobos_toolexeclibdir = @libphobos_toolexeclibdir@
localedir = @localedir@ localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
...@@ -615,6 +617,7 @@ phobos_compiler_shared_flag = @phobos_compiler_shared_flag@ ...@@ -615,6 +617,7 @@ phobos_compiler_shared_flag = @phobos_compiler_shared_flag@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
...@@ -624,8 +627,6 @@ target_alias = @target_alias@ ...@@ -624,8 +627,6 @@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
...@@ -633,6 +634,8 @@ 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) # If there are no sources with known extension (i.e. only D sources)
# automake forgets to set this # automake forgets to set this
CCLD = $(CC) CCLD = $(CC)
toolexecdir = $(libphobos_toolexecdir)
toolexeclibdir = $(libphobos_toolexeclibdir)
LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ LTDCOMPILE = $(LIBTOOL) --tag=D $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=compile $(GDC) $(AM_DFLAGS) --mode=compile $(GDC) $(AM_DFLAGS)
......
libphobos/testsuite/Makefile.in
...@@ -252,6 +252,8 @@ libdir = @libdir@ ...@@ -252,6 +252,8 @@ libdir = @libdir@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
libphobos_builddir = @libphobos_builddir@ libphobos_builddir = @libphobos_builddir@
libphobos_srcdir = @libphobos_srcdir@ libphobos_srcdir = @libphobos_srcdir@
libphobos_toolexecdir = @libphobos_toolexecdir@
libphobos_toolexeclibdir = @libphobos_toolexeclibdir@
localedir = @localedir@ localedir = @localedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
mandir = @mandir@ mandir = @mandir@
...@@ -264,6 +266,7 @@ phobos_compiler_shared_flag = @phobos_compiler_shared_flag@ ...@@ -264,6 +266,7 @@ phobos_compiler_shared_flag = @phobos_compiler_shared_flag@
prefix = @prefix@ prefix = @prefix@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
psdir = @psdir@ psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@ srcdir = @srcdir@
...@@ -273,8 +276,6 @@ target_alias = @target_alias@ ...@@ -273,8 +276,6 @@ target_alias = @target_alias@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_os = @target_os@ target_os = @target_os@
target_vendor = @target_vendor@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@
top_build_prefix = @top_build_prefix@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment