mirror of
https://github.com/gcc-mirror/gcc.git
synced 2024-11-21 13:40:47 +00:00
Add `--with-toolexeclibdir=' configuration option
Provide means, in the form of a `--with-toolexeclibdir=' configuration option, to override the default installation directory for target libraries, otherwise known as $toolexeclibdir. This is so that it is possible to get newly-built libraries, particularly the shared ones, installed in a common place, so that they can be readily used by the target system as their host libraries, possibly over NFS, without a need to manually copy them over from the currently hardcoded location they would otherwise be installed in. In the presence of the `--enable-version-specific-runtime-libs' option and for configurations building native GCC the option is ignored. config/ * toolexeclibdir.m4: New file. gcc/ * doc/install.texi (Cross-Compiler-Specific Options): Document `--with-toolexeclibdir' option. libada/ * Makefile.in (configure_deps): Add `toolexeclibdir.m4'. * configure.ac: Handle `--with-toolexeclibdir='. * configure: Regenerate. libatomic/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite/Makefile.in: Regenerate. libffi/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. * include/Makefile.in: Regenerate. * man/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. libgcc/ * Makefile.in (configure_deps): Add `toolexeclibdir.m4'. * configure.ac: Handle `--with-toolexeclibdir='. * configure: Regenerate. libgfortran/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. libgomp/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite/Makefile.in: Regenerate. libhsail-rt/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. libitm/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite/Makefile.in: Regenerate. libobjc/ * Makefile.in (aclocal_deps): Add `toolexeclibdir.m4'. * aclocal.m4: Include `toolexeclibdir.m4'. * configure.ac: Handle `--with-toolexeclibdir='. * configure: Regenerate. liboffloadmic/ * plugin/configure.ac: Handle `--with-toolexeclibdir='. * plugin/Makefile.in: Regenerate. * plugin/aclocal.m4: Regenerate. * plugin/configure: Regenerate. * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. libphobos/ * m4/druntime.m4: Handle `--with-toolexeclibdir='. * m4/Makefile.in: Regenerate. * libdruntime/Makefile.in: Regenerate. * src/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. libquadmath/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. libsanitizer/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. * asan/Makefile.in: Regenerate. * interception/Makefile.in: Regenerate. * libbacktrace/Makefile.in: Regenerate. * lsan/Makefile.in: Regenerate. * sanitizer_common/Makefile.in: Regenerate. * tsan/Makefile.in: Regenerate. * ubsan/Makefile.in: Regenerate. libssp/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. libstdc++-v3/ * acinclude.m4: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. * doc/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * libsupc++/Makefile.in: Regenerate. * po/Makefile.in: Regenerate. * python/Makefile.in: Regenerate. * src/Makefile.in: Regenerate. * src/c++11/Makefile.in: Regenerate. * src/c++17/Makefile.in: Regenerate. * src/c++98/Makefile.in: Regenerate. * src/filesystem/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. libvtv/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate. * testsuite/Makefile.in: Regenerate. zlib/ * configure.ac: Handle `--with-toolexeclibdir='. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * configure: Regenerate.
This commit is contained in:
parent
e3fe0070c1
commit
e8e66971cd
@ -1,3 +1,7 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* toolexeclibdir.m4: New file.
|
||||
|
||||
2019-09-10 Christophe Lyon <christophe.lyon@st.com>
|
||||
|
||||
* futex.m4: Handle *-uclinux*.
|
||||
|
31
config/toolexeclibdir.m4
Normal file
31
config/toolexeclibdir.m4
Normal file
@ -0,0 +1,31 @@
|
||||
dnl toolexeclibdir override support.
|
||||
dnl Copyright (C) 2020 Free Software Foundation, Inc.
|
||||
dnl
|
||||
dnl This program is free software; you can redistribute it and/or modify
|
||||
dnl it under the terms of the GNU General Public License as published by
|
||||
dnl the Free Software Foundation; either version 3, or (at your option)
|
||||
dnl any later version.
|
||||
dnl
|
||||
dnl This program is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
dnl GNU General Public License for more details.
|
||||
dnl
|
||||
dnl You should have received a copy of the GNU General Public License
|
||||
dnl along with this program; see the file COPYING3. If not see
|
||||
dnl <http://www.gnu.org/licenses/>.
|
||||
|
||||
AC_DEFUN([GCC_WITH_TOOLEXECLIBDIR],
|
||||
[AC_ARG_WITH(toolexeclibdir,
|
||||
[AS_HELP_STRING([--with-toolexeclibdir=DIR],
|
||||
[install libraries built with a cross compiler within DIR])],
|
||||
[dnl
|
||||
case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac],
|
||||
[with_toolexeclibdir=no])
|
||||
])
|
@ -1,3 +1,8 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* doc/install.texi (Cross-Compiler-Specific Options): Document
|
||||
`--with-toolexeclibdir' option.
|
||||
|
||||
2020-01-24 Hans-Peter Nilsson <hp@axis.com>
|
||||
|
||||
* target.def (flags_regnum): Also mention effect on delay slot filling.
|
||||
|
@ -2207,6 +2207,10 @@ target if target binutils supported.
|
||||
The following options only apply to building cross compilers.
|
||||
|
||||
@table @code
|
||||
@item --with-toolexeclibdir=@var{dir}
|
||||
Specify the installation directory for libraries built with a cross compiler.
|
||||
The default is @option{$@{gcc_tooldir@}/lib}.
|
||||
|
||||
@item --with-sysroot
|
||||
@itemx --with-sysroot=@var{dir}
|
||||
Tells GCC to consider @var{dir} as the root of a tree that contains
|
||||
|
@ -1,3 +1,9 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* Makefile.in (configure_deps): Add `toolexeclibdir.m4'.
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* configure: Regenerate.
|
||||
|
||||
2020-01-01 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
Update copyright years.
|
||||
|
@ -186,6 +186,7 @@ configure_deps = \
|
||||
$(srcdir)/../config/multi.m4 \
|
||||
$(srcdir)/../config/override.m4 \
|
||||
$(srcdir)/../config/picflag.m4 \
|
||||
$(srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(srcdir)/../config/unwind_ipinfo.m4
|
||||
|
||||
$(srcdir)/configure: @MAINT@ $(configure_deps)
|
||||
|
29
libada/configure
vendored
29
libada/configure
vendored
@ -704,6 +704,7 @@ enable_option_checking
|
||||
with_build_libsubdir
|
||||
enable_version_specific_runtime_libs
|
||||
enable_maintainer_mode
|
||||
with_toolexeclibdir
|
||||
enable_multilib
|
||||
enable_shared
|
||||
with_system_libunwind
|
||||
@ -1339,6 +1340,9 @@ Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-build-libsubdir=DIR Directory where to find libraries for build system
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-system-libunwind use installed libunwind
|
||||
--with-gcc-major-version-only
|
||||
use only GCC major number in filesystem paths
|
||||
@ -2249,6 +2253,22 @@ else
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Default to --enable-multilib
|
||||
# Check whether --enable-multilib was given.
|
||||
if test "${enable_multilib+set}" = set; then :
|
||||
@ -2301,7 +2321,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -19,6 +19,7 @@ sinclude(../config/acx.m4)
|
||||
sinclude(../config/multi.m4)
|
||||
sinclude(../config/override.m4)
|
||||
sinclude(../config/picflag.m4)
|
||||
sinclude(../config/toolexeclibdir.m4)
|
||||
sinclude(../config/unwind_ipinfo.m4)
|
||||
|
||||
AC_INIT
|
||||
@ -67,6 +68,8 @@ AC_ARG_ENABLE([maintainer-mode],
|
||||
[MAINT='#'])
|
||||
AC_SUBST([MAINT])dnl
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
AM_ENABLE_MULTILIB(, ..)
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
@ -83,7 +86,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -1,3 +1,11 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
* testsuite/Makefile.in: Regenerate.
|
||||
|
||||
2020-01-01 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
Update copyright years.
|
||||
|
@ -106,6 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../config/warnings.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
|
1
libatomic/aclocal.m4
vendored
1
libatomic/aclocal.m4
vendored
@ -1194,6 +1194,7 @@ m4_include([../config/lthostflags.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/stdint.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../config/warnings.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
|
33
libatomic/configure
vendored
33
libatomic/configure
vendored
@ -794,6 +794,7 @@ enable_version_specific_runtime_libs
|
||||
enable_generated_files_in_srcdir
|
||||
enable_silent_rules
|
||||
enable_multilib
|
||||
with_toolexeclibdir
|
||||
enable_dependency_tracking
|
||||
enable_shared
|
||||
enable_static
|
||||
@ -1459,6 +1460,9 @@ Optional Features:
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
@ -3343,6 +3347,22 @@ fi
|
||||
ac_config_commands="$ac_config_commands default-1"
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -3358,7 +3378,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
@ -11360,7 +11387,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11363 "configure"
|
||||
#line 11390 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11466,7 +11493,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11469 "configure"
|
||||
#line 11496 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -84,6 +84,8 @@ target_alias=${target_alias-$host_alias}
|
||||
AM_INIT_AUTOMAKE([1.9.0 foreign no-dist -Wall -Wno-portability -Wno-override])
|
||||
AM_ENABLE_MULTILIB(, ..)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -99,7 +101,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../config/warnings.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
|
@ -1,3 +1,13 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
* include/Makefile.in: Regenerate.
|
||||
* man/Makefile.in: Regenerate.
|
||||
* testsuite/Makefile.in: Regenerate.
|
||||
|
||||
2019-09-27 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
@ -103,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
|
1
libffi/aclocal.m4
vendored
1
libffi/aclocal.m4
vendored
@ -1193,6 +1193,7 @@ m4_include([../config/depstand.m4])
|
||||
m4_include([../config/lead-dot.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../libtool.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
|
33
libffi/configure
vendored
33
libffi/configure
vendored
@ -813,6 +813,7 @@ enable_debug
|
||||
enable_structs
|
||||
enable_raw_api
|
||||
enable_purify_safety
|
||||
with_toolexeclibdir
|
||||
enable_symvers
|
||||
with_gcc_major_version_only
|
||||
'
|
||||
@ -1476,6 +1477,9 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-gcc-major-version-only
|
||||
use only GCC major number in filesystem paths
|
||||
|
||||
@ -11557,7 +11561,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11560 "configure"
|
||||
#line 11564 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11663,7 +11667,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11666 "configure"
|
||||
#line 11670 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -16177,10 +16181,33 @@ $as_echo "#define USING_PURIFY 1" >>confdefs.h
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test -n "$with_cross_host" &&
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -332,10 +332,19 @@ AC_ARG_ENABLE(purify-safety,
|
||||
AC_DEFINE(USING_PURIFY, 1, [Define this if you are using Purify and want to suppress spurious messages.])
|
||||
fi)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
if test -n "$with_cross_host" &&
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
|
@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
|
@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
|
@ -1,3 +1,9 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* Makefile.in (configure_deps): Add `toolexeclibdir.m4'.
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* configure: Regenerate.
|
||||
|
||||
2020-01-23 Dragan Mladjenovic <dmladjenovic@wavecomp.com>
|
||||
|
||||
* config/mips/gnustack.h: Check for TARGET_LIBC_GNUSTACK also.
|
||||
|
@ -165,6 +165,7 @@ AUTOCONF = autoconf
|
||||
configure_deps = \
|
||||
$(srcdir)/../config/enable.m4 \
|
||||
$(srcdir)/../config/tls.m4 \
|
||||
$(srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(srcdir)/../config/acx.m4 \
|
||||
$(srcdir)/../config/no-executables.m4 \
|
||||
$(srcdir)/../config/lib-ld.m4 \
|
||||
|
38
libgcc/configure
vendored
38
libgcc/configure
vendored
@ -705,6 +705,7 @@ enable_gcov
|
||||
enable_vtable_verify
|
||||
with_aix_soname
|
||||
enable_version_specific_runtime_libs
|
||||
with_toolexeclibdir
|
||||
with_slibdir
|
||||
enable_maintainer_mode
|
||||
with_build_libsubdir
|
||||
@ -1369,6 +1370,9 @@ Optional Packages:
|
||||
--with-aix-soname=aix|svr4|both
|
||||
shared library versioning (aka "SONAME") variant to
|
||||
provide on AIX
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-slibdir=DIR shared libraries in DIR LIBDIR
|
||||
--with-build-libsubdir=DIR Directory where to find libraries for build system
|
||||
--with-system-libunwind use installed libunwind
|
||||
@ -2464,6 +2468,22 @@ fi
|
||||
$as_echo "$version_specific_libs" >&6; }
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-slibdir was given.
|
||||
if test "${with_slibdir+set}" = set; then :
|
||||
withval=$with_slibdir; slibdir="$with_slibdir"
|
||||
@ -2471,7 +2491,14 @@ else
|
||||
if test "${version_specific_libs}" = yes; then
|
||||
slibdir='$(libsubdir)'
|
||||
elif test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then
|
||||
slibdir='$(exec_prefix)/$(host_noncanonical)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
slibdir='$(exec_prefix)/$(host_noncanonical)/lib'
|
||||
;;
|
||||
*)
|
||||
slibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
slibdir='$(libdir)'
|
||||
fi
|
||||
@ -2701,7 +2728,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_noncanonical)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
sinclude(../config/enable.m4)
|
||||
sinclude(../config/tls.m4)
|
||||
sinclude(../config/toolexeclibdir.m4)
|
||||
sinclude(../config/acx.m4)
|
||||
sinclude(../config/no-executables.m4)
|
||||
sinclude(../config/lib-ld.m4)
|
||||
@ -113,16 +114,25 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
|
||||
[version_specific_libs=no])
|
||||
AC_MSG_RESULT($version_specific_libs)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
AC_ARG_WITH(slibdir,
|
||||
[ --with-slibdir=DIR shared libraries in DIR [LIBDIR]],
|
||||
slibdir="$with_slibdir",
|
||||
if test "${version_specific_libs}" = yes; then
|
||||
[if test "${version_specific_libs}" = yes; then
|
||||
slibdir='$(libsubdir)'
|
||||
elif test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then
|
||||
slibdir='$(exec_prefix)/$(host_noncanonical)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
slibdir='$(exec_prefix)/$(host_noncanonical)/lib'
|
||||
;;
|
||||
*)
|
||||
slibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
slibdir='$(libdir)'
|
||||
fi)
|
||||
fi])
|
||||
AC_SUBST(slibdir)
|
||||
|
||||
# Command-line options.
|
||||
@ -168,7 +178,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_noncanonical)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -1,3 +1,10 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2020-01-17 Jerry DeLisle <jvdelisle@gcc.gnu.org>
|
||||
|
||||
PR libfortran/93234
|
||||
|
@ -167,6 +167,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/acx.m4 \
|
||||
|
1
libgfortran/aclocal.m4
vendored
1
libgfortran/aclocal.m4
vendored
@ -1174,6 +1174,7 @@ m4_include([../config/lthostflags.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/stdint.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
m4_include([../ltversion.m4])
|
||||
|
33
libgfortran/configure
vendored
33
libgfortran/configure
vendored
@ -809,6 +809,7 @@ enable_silent_rules
|
||||
enable_maintainer_mode
|
||||
enable_multilib
|
||||
enable_dependency_tracking
|
||||
with_toolexeclibdir
|
||||
enable_cet
|
||||
enable_symvers
|
||||
with_gnu_ld
|
||||
@ -1480,6 +1481,9 @@ Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-build-libsubdir=DIR Directory where to find libraries for build system
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
@ -5173,6 +5177,22 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -5188,7 +5208,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
@ -12692,7 +12719,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12695 "configure"
|
||||
#line 12722 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12798,7 +12825,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12801 "configure"
|
||||
#line 12828 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -86,6 +86,8 @@ fi
|
||||
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -101,7 +103,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -1,3 +1,11 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
* testsuite/Makefile.in: Regenerate.
|
||||
|
||||
2020-01-24 Frederik Harwath <frederik@codesourcery.com>
|
||||
|
||||
* testsuite/libgomp.oacc-c-c++-common/acc_get_property-aux.c
|
||||
|
@ -133,10 +133,12 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lthostflags.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../config/cet.m4 \
|
||||
$(top_srcdir)/../config/tls.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
$(top_srcdir)/../config/cet.m4 \
|
||||
$(top_srcdir)/plugin/configfrag.ac $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
|
1
libgomp/aclocal.m4
vendored
1
libgomp/aclocal.m4
vendored
@ -1177,6 +1177,7 @@ m4_include([../config/lthostflags.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/tls.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
m4_include([../ltversion.m4])
|
||||
|
33
libgomp/configure
vendored
33
libgomp/configure
vendored
@ -826,6 +826,7 @@ enable_version_specific_runtime_libs
|
||||
enable_generated_files_in_srcdir
|
||||
enable_silent_rules
|
||||
enable_multilib
|
||||
with_toolexeclibdir
|
||||
enable_dependency_tracking
|
||||
enable_shared
|
||||
enable_static
|
||||
@ -1505,6 +1506,9 @@ Optional Features:
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
@ -3501,6 +3505,22 @@ fi
|
||||
ac_config_commands="$ac_config_commands default-1"
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -3516,7 +3536,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
@ -11405,7 +11432,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11408 "configure"
|
||||
#line 11435 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11511,7 +11538,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11514 "configure"
|
||||
#line 11541 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -64,6 +64,8 @@ target_alias=${target_alias-$host_alias}
|
||||
AM_INIT_AUTOMAKE([1.9.0 foreign no-dist -Wall -Wno-portability -Wno-override])
|
||||
AM_ENABLE_MULTILIB(, ..)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -79,7 +81,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -99,10 +99,12 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lthostflags.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../config/cet.m4 \
|
||||
$(top_srcdir)/../config/tls.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
$(top_srcdir)/../config/cet.m4 \
|
||||
$(top_srcdir)/plugin/configfrag.ac $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
|
@ -1,3 +1,10 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2020-01-01 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
Update copyright years.
|
||||
|
@ -139,6 +139,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/depstand.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
|
||||
|
1
libhsail-rt/aclocal.m4
vendored
1
libhsail-rt/aclocal.m4
vendored
@ -1171,6 +1171,7 @@ m4_include([../config/acx.m4])
|
||||
m4_include([../config/depstand.m4])
|
||||
m4_include([../config/lead-dot.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../libtool.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
|
33
libhsail-rt/configure
vendored
33
libhsail-rt/configure
vendored
@ -773,6 +773,7 @@ enable_silent_rules
|
||||
enable_maintainer_mode
|
||||
enable_dependency_tracking
|
||||
enable_version_specific_runtime_libs
|
||||
with_toolexeclibdir
|
||||
enable_shared
|
||||
enable_static
|
||||
with_pic
|
||||
@ -1435,6 +1436,9 @@ Optional Features:
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
@ -4653,6 +4657,22 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_version_specific_runtime_libs" >&5
|
||||
$as_echo "$enable_version_specific_runtime_libs" >&6; }
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -4668,7 +4688,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
@ -11212,7 +11239,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11215 "configure"
|
||||
#line 11242 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11318,7 +11345,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11321 "configure"
|
||||
#line 11348 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -69,6 +69,8 @@ ler-specific directory]),
|
||||
[enable_version_specific_runtime_libs=no])
|
||||
AC_MSG_RESULT($enable_version_specific_runtime_libs)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -84,7 +86,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -1,3 +1,11 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
* testsuite/Makefile.in: Regenerate.
|
||||
|
||||
2020-01-01 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
Update copyright years.
|
||||
|
@ -107,6 +107,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/tls.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../config/weakref.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
|
1
libitm/aclocal.m4
vendored
1
libitm/aclocal.m4
vendored
@ -1199,6 +1199,7 @@ m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/stdint.m4])
|
||||
m4_include([../config/tls.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../config/weakref.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
|
33
libitm/configure
vendored
33
libitm/configure
vendored
@ -802,6 +802,7 @@ enable_version_specific_runtime_libs
|
||||
enable_generated_files_in_srcdir
|
||||
enable_silent_rules
|
||||
enable_multilib
|
||||
with_toolexeclibdir
|
||||
enable_dependency_tracking
|
||||
enable_shared
|
||||
enable_static
|
||||
@ -1472,6 +1473,9 @@ Optional Features:
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
@ -3527,6 +3531,22 @@ fi
|
||||
ac_config_commands="$ac_config_commands default-1"
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -3542,7 +3562,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
@ -12037,7 +12064,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12040 "configure"
|
||||
#line 12067 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12143,7 +12170,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12146 "configure"
|
||||
#line 12173 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -78,6 +78,8 @@ target_alias=${target_alias-$host_alias}
|
||||
AM_INIT_AUTOMAKE([1.9.0 foreign no-dist -Wall -Wno-portability -Wno-override])
|
||||
AM_ENABLE_MULTILIB(, ..)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -93,7 +95,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/tls.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../config/weakref.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
|
@ -1,3 +1,10 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* Makefile.in (aclocal_deps): Add `toolexeclibdir.m4'.
|
||||
* aclocal.m4: Include `toolexeclibdir.m4'.
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* configure: Regenerate.
|
||||
|
||||
2020-01-01 Andrew Pinski <pinskia@gmail.com>
|
||||
|
||||
PR libobjc/93099
|
||||
|
@ -293,6 +293,7 @@ aclocal_deps = \
|
||||
$(srcdir)/../config/multi.m4 \
|
||||
$(srcdir)/../config/override.m4 \
|
||||
$(srcdir)/../config/proginstall.m4 \
|
||||
$(srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(srcdir)/../ltoptions.m4 \
|
||||
$(srcdir)/../ltsugar.m4 \
|
||||
$(srcdir)/../ltversion.m4 \
|
||||
|
1
libobjc/aclocal.m4
vendored
1
libobjc/aclocal.m4
vendored
@ -153,4 +153,5 @@ m4_include([../config/cet.m4])
|
||||
m4_include([../config/lthostflags.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([acinclude.m4])
|
||||
|
33
libobjc/configure
vendored
33
libobjc/configure
vendored
@ -746,6 +746,7 @@ with_target_subdir
|
||||
with_cross_host
|
||||
enable_version_specific_runtime_libs
|
||||
enable_multilib
|
||||
with_toolexeclibdir
|
||||
enable_cet
|
||||
enable_maintainer_mode
|
||||
enable_shared
|
||||
@ -1402,6 +1403,9 @@ Optional Packages:
|
||||
--with-target-subdir=SUBDIR
|
||||
configuring in a subdirectory
|
||||
--with-cross-host=HOST configuring with a cross compiler
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
@ -2502,6 +2506,22 @@ case $srcdir in
|
||||
esac
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -2517,7 +2537,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_noncanonical)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
@ -10748,7 +10775,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10751 "configure"
|
||||
#line 10778 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10854,7 +10881,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10857 "configure"
|
||||
#line 10884 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -76,6 +76,8 @@ case $srcdir in
|
||||
esac
|
||||
AC_SUBST(glibcpp_srcdir)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -91,7 +93,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_noncanonical)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_noncanonical)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -1,3 +1,14 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* plugin/configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* plugin/Makefile.in: Regenerate.
|
||||
* plugin/aclocal.m4: Regenerate.
|
||||
* plugin/configure: Regenerate.
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2020-01-10 Thomas Schwinge <thomas@codesourcery.com>
|
||||
|
||||
* plugin/libgomp-plugin-intelmic.cpp (GOMP_OFFLOAD_get_property):
|
||||
|
@ -126,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
|
||||
|
1
liboffloadmic/aclocal.m4
vendored
1
liboffloadmic/aclocal.m4
vendored
@ -1172,6 +1172,7 @@ m4_include([../config/depstand.m4])
|
||||
m4_include([../config/lead-dot.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../libtool.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
|
33
liboffloadmic/configure
vendored
33
liboffloadmic/configure
vendored
@ -775,6 +775,7 @@ enable_maintainer_mode
|
||||
enable_dependency_tracking
|
||||
enable_multilib
|
||||
enable_version_specific_runtime_libs
|
||||
with_toolexeclibdir
|
||||
enable_shared
|
||||
enable_static
|
||||
with_pic
|
||||
@ -1437,6 +1438,9 @@ Optional Features:
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
@ -5293,6 +5297,22 @@ else
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir.
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir.
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -5308,7 +5328,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
@ -11403,7 +11430,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11406 "configure"
|
||||
#line 11433 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11509,7 +11536,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11512 "configure"
|
||||
#line 11539 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -79,6 +79,8 @@ case "$enable_liboffloadmic" in
|
||||
esac
|
||||
AM_CONDITIONAL(LIBOFFLOADMIC_HOST, [test x"$enable_liboffloadmic" = xhost])
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir.
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir.
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -94,7 +96,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -123,6 +123,7 @@ subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../../config/acx.m4 \
|
||||
$(top_srcdir)/../../config/depstand.m4 \
|
||||
$(top_srcdir)/../../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../../config/multi.m4 \
|
||||
$(top_srcdir)/../../config/override.m4 \
|
||||
|
1
liboffloadmic/plugin/aclocal.m4
vendored
1
liboffloadmic/plugin/aclocal.m4
vendored
@ -1169,6 +1169,7 @@ AC_SUBST([am__untar])
|
||||
|
||||
m4_include([../../config/acx.m4])
|
||||
m4_include([../../config/depstand.m4])
|
||||
m4_include([../../config/toolexeclibdir.m4])
|
||||
m4_include([../../config/lead-dot.m4])
|
||||
m4_include([../../config/multi.m4])
|
||||
m4_include([../../config/override.m4])
|
||||
|
33
liboffloadmic/plugin/configure
vendored
33
liboffloadmic/plugin/configure
vendored
@ -771,6 +771,7 @@ enable_maintainer_mode
|
||||
enable_dependency_tracking
|
||||
enable_multilib
|
||||
enable_version_specific_runtime_libs
|
||||
with_toolexeclibdir
|
||||
enable_shared
|
||||
enable_static
|
||||
with_pic
|
||||
@ -1434,6 +1435,9 @@ Optional Features:
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
@ -4542,6 +4546,22 @@ fi
|
||||
$as_echo "$enable_version_specific_runtime_libs" >&6; }
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir.
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir.
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -4557,7 +4577,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
@ -11050,7 +11077,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11053 "configure"
|
||||
#line 11080 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11156,7 +11183,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11159 "configure"
|
||||
#line 11186 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -95,6 +95,8 @@ AC_ARG_ENABLE([version-specific-runtime-libs],
|
||||
AC_MSG_RESULT($enable_version_specific_runtime_libs)
|
||||
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir.
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir.
|
||||
case ${enable_version_specific_runtime_libs} in
|
||||
@ -110,7 +112,14 @@ case ${enable_version_specific_runtime_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -1,3 +1,14 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* m4/druntime.m4: Handle `--with-toolexeclibdir='.
|
||||
* m4/Makefile.in: Regenerate.
|
||||
* libdruntime/Makefile.in: Regenerate.
|
||||
* src/Makefile.in: Regenerate.
|
||||
* testsuite/Makefile.in: Regenerate.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2020-01-01 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
Update copyright years.
|
||||
|
@ -111,6 +111,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
|
1
libphobos/aclocal.m4
vendored
1
libphobos/aclocal.m4
vendored
@ -876,6 +876,7 @@ m4_include([../config/acx.m4])
|
||||
m4_include([../config/lead-dot.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../libtool.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
|
33
libphobos/configure
vendored
33
libphobos/configure
vendored
@ -837,6 +837,7 @@ with_libbacktrace
|
||||
with_target_system_zlib
|
||||
with_cross_host
|
||||
enable_version_specific_runtime_libs
|
||||
with_toolexeclibdir
|
||||
enable_libphobos
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@ -1504,6 +1505,9 @@ Optional Packages:
|
||||
--with-target-system-zlib={yes,no,auto}
|
||||
use installed libz (default: no)
|
||||
--with-cross-host=HOST configuring with a cross compiler
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
|
||||
Some influential environment variables:
|
||||
CC C compiler command
|
||||
@ -11640,7 +11644,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11643 "configure"
|
||||
#line 11647 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11746,7 +11750,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11749 "configure"
|
||||
#line 11753 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -15237,6 +15241,22 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $version_specific_libs" >&5
|
||||
$as_echo "$version_specific_libs" >&6; }
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Version-specific runtime libs processing.
|
||||
if test $version_specific_libs = yes; then
|
||||
libphobos_toolexecdir='${libdir}/gcc/${host_alias}'
|
||||
@ -15246,7 +15266,14 @@ $as_echo "$version_specific_libs" >&6; }
|
||||
# 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
|
||||
libphobos_toolexecdir='${exec_prefix}/${host_alias}'
|
||||
libphobos_toolexeclibdir='${toolexecdir}/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
libphobos_toolexeclibdir='${toolexecdir}/lib'
|
||||
;;
|
||||
*)
|
||||
libphobos_toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
libphobos_toolexecdir='${libdir}/gcc/${host_alias}'
|
||||
libphobos_toolexeclibdir='${libdir}'
|
||||
|
@ -136,6 +136,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
|
@ -80,6 +80,8 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
|
||||
[version_specific_libs=no])
|
||||
AC_MSG_RESULT($version_specific_libs)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Version-specific runtime libs processing.
|
||||
if test $version_specific_libs = yes; then
|
||||
libphobos_toolexecdir='${libdir}/gcc/${host_alias}'
|
||||
@ -89,7 +91,14 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
|
||||
# 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
|
||||
libphobos_toolexecdir='${exec_prefix}/${host_alias}'
|
||||
libphobos_toolexeclibdir='${toolexecdir}/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
libphobos_toolexeclibdir='${toolexecdir}/lib'
|
||||
;;
|
||||
*)
|
||||
libphobos_toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
libphobos_toolexecdir='${libdir}/gcc/${host_alias}'
|
||||
libphobos_toolexeclibdir='${libdir}'
|
||||
|
@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
|
@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/lead-dot.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
|
||||
|
@ -1,3 +1,10 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2020-01-01 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
Update copyright years.
|
||||
|
@ -100,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/no-executables.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
|
1
libquadmath/aclocal.m4
vendored
1
libquadmath/aclocal.m4
vendored
@ -1174,6 +1174,7 @@ m4_include([../config/lthostflags.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/no-executables.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
m4_include([../ltversion.m4])
|
||||
|
33
libquadmath/configure
vendored
33
libquadmath/configure
vendored
@ -786,6 +786,7 @@ enable_fast_install
|
||||
with_gnu_ld
|
||||
enable_libtool_lock
|
||||
enable_maintainer_mode
|
||||
with_toolexeclibdir
|
||||
enable_symvers
|
||||
enable_cet
|
||||
enable_generated_files_in_srcdir
|
||||
@ -1451,6 +1452,9 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-gcc-major-version-only
|
||||
use only GCC major number in filesystem paths
|
||||
|
||||
@ -10810,7 +10814,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10813 "configure"
|
||||
#line 10817 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10916,7 +10920,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10919 "configure"
|
||||
#line 10923 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12088,6 +12092,22 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -12103,7 +12123,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -82,6 +82,8 @@ if test "x$GCC" != "xyes"; then
|
||||
fi
|
||||
AC_PROG_CPP
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -97,7 +99,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -1,3 +1,17 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
* asan/Makefile.in: Regenerate.
|
||||
* interception/Makefile.in: Regenerate.
|
||||
* libbacktrace/Makefile.in: Regenerate.
|
||||
* lsan/Makefile.in: Regenerate.
|
||||
* sanitizer_common/Makefile.in: Regenerate.
|
||||
* tsan/Makefile.in: Regenerate.
|
||||
* ubsan/Makefile.in: Regenerate.
|
||||
|
||||
2019-11-26 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
PR sanitizer/92154
|
||||
|
@ -105,6 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
|
1
libsanitizer/aclocal.m4
vendored
1
libsanitizer/aclocal.m4
vendored
@ -1194,6 +1194,7 @@ m4_include([../config/libstdc++-raw-cxx.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/stdint.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
m4_include([../ltversion.m4])
|
||||
|
@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
|
33
libsanitizer/configure
vendored
33
libsanitizer/configure
vendored
@ -806,6 +806,7 @@ enable_version_specific_runtime_libs
|
||||
enable_dependency_tracking
|
||||
enable_silent_rules
|
||||
enable_maintainer_mode
|
||||
with_toolexeclibdir
|
||||
enable_shared
|
||||
enable_static
|
||||
with_pic
|
||||
@ -1470,6 +1471,9 @@ Optional Features:
|
||||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
@ -5012,6 +5016,22 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -5027,7 +5047,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
@ -12334,7 +12361,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12337 "configure"
|
||||
#line 12364 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12440,7 +12467,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12443 "configure"
|
||||
#line 12470 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
@ -29,6 +29,8 @@ GCC_LIBSTDCXX_RAW_CXX_FLAGS
|
||||
AM_INIT_AUTOMAKE(foreign no-dist)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -44,7 +46,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
|
@ -129,6 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
|
@ -100,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
|
@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
|
@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
|
@ -100,6 +100,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
|
||||
$(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
|
||||
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
|
||||
|
@ -1,3 +1,10 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* configure.ac: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2020-01-01 Jakub Jelinek <jakub@redhat.com>
|
||||
|
||||
Update copyright years.
|
||||
|
@ -101,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/multi.m4 \
|
||||
$(top_srcdir)/../config/no-executables.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
$(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/configure.ac
|
||||
|
1
libssp/aclocal.m4
vendored
1
libssp/aclocal.m4
vendored
@ -1176,6 +1176,7 @@ m4_include([../config/lthostflags.m4])
|
||||
m4_include([../config/multi.m4])
|
||||
m4_include([../config/no-executables.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../libtool.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
m4_include([../ltsugar.m4])
|
||||
|
33
libssp/configure
vendored
33
libssp/configure
vendored
@ -781,6 +781,7 @@ with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
enable_libtool_lock
|
||||
with_toolexeclibdir
|
||||
with_gcc_major_version_only
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@ -1432,6 +1433,9 @@ Optional Packages:
|
||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||
both]
|
||||
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-gcc-major-version-only
|
||||
use only GCC major number in filesystem paths
|
||||
|
||||
@ -10992,7 +10996,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 10995 "configure"
|
||||
#line 10999 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11098,7 +11102,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 11101 "configure"
|
||||
#line 11105 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -11360,6 +11364,22 @@ esac
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -11375,7 +11395,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -163,6 +163,8 @@ ACX_LT_HOST_FLAGS
|
||||
AC_SUBST(enable_shared)
|
||||
AC_SUBST(enable_static)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Calculate toolexeclibdir
|
||||
# Also toolexecdir, though it's only used in toolexeclibdir
|
||||
case ${version_specific_libs} in
|
||||
@ -178,7 +180,14 @@ case ${version_specific_libs} in
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||
toolexecdir='$(exec_prefix)/$(target_alias)'
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
toolexeclibdir='$(toolexecdir)/lib'
|
||||
;;
|
||||
*)
|
||||
toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
||||
toolexeclibdir='$(libdir)'
|
||||
|
@ -1,3 +1,21 @@
|
||||
2020-01-24 Maciej W. Rozycki <macro@wdc.com>
|
||||
|
||||
* acinclude.m4: Handle `--with-toolexeclibdir='.
|
||||
* Makefile.in: Regenerate.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
* doc/Makefile.in: Regenerate.
|
||||
* include/Makefile.in: Regenerate.
|
||||
* libsupc++/Makefile.in: Regenerate.
|
||||
* po/Makefile.in: Regenerate.
|
||||
* python/Makefile.in: Regenerate.
|
||||
* src/Makefile.in: Regenerate.
|
||||
* src/c++11/Makefile.in: Regenerate.
|
||||
* src/c++17/Makefile.in: Regenerate.
|
||||
* src/c++98/Makefile.in: Regenerate.
|
||||
* src/filesystem/Makefile.in: Regenerate.
|
||||
* testsuite/Makefile.in: Regenerate.
|
||||
|
||||
2020-01-23 Alexandre Oliva <oliva@adacore.com>
|
||||
|
||||
* crossconfig.m4 (GLIBCXX_CHECK_MATH_DECL): Reject macros.
|
||||
|
@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/no-executables.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../config/unwind_ipinfo.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
|
@ -785,6 +785,8 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
|
||||
[version_specific_libs=no])
|
||||
AC_MSG_RESULT($version_specific_libs)
|
||||
|
||||
GCC_WITH_TOOLEXECLIBDIR
|
||||
|
||||
# Default case for install directory for include files.
|
||||
if test $version_specific_libs = no && test $gxx_include_dir = no; then
|
||||
gxx_include_dir='include/c++/${gcc_version}'
|
||||
@ -815,7 +817,14 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
|
||||
if test -n "$with_cross_host" &&
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
|
||||
glibcxx_toolexeclibdir='${toolexecdir}/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
glibcxx_toolexeclibdir='${toolexecdir}/lib'
|
||||
;;
|
||||
*)
|
||||
glibcxx_toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
|
||||
glibcxx_toolexeclibdir='${libdir}'
|
||||
|
1
libstdc++-v3/aclocal.m4
vendored
1
libstdc++-v3/aclocal.m4
vendored
@ -866,6 +866,7 @@ m4_include([../config/multi.m4])
|
||||
m4_include([../config/no-executables.m4])
|
||||
m4_include([../config/override.m4])
|
||||
m4_include([../config/stdint.m4])
|
||||
m4_include([../config/toolexeclibdir.m4])
|
||||
m4_include([../config/unwind_ipinfo.m4])
|
||||
m4_include([../libtool.m4])
|
||||
m4_include([../ltoptions.m4])
|
||||
|
47
libstdc++-v3/configure
vendored
47
libstdc++-v3/configure
vendored
@ -942,6 +942,7 @@ enable_libstdcxx_filesystem_ts
|
||||
enable_cet
|
||||
with_gxx_include_dir
|
||||
enable_version_specific_runtime_libs
|
||||
with_toolexeclibdir
|
||||
with_gcc_major_version_only
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@ -1669,6 +1670,9 @@ Optional Packages:
|
||||
set the std::string ABI to use by default
|
||||
--with-gxx-include-dir=DIR
|
||||
installation directory for include files
|
||||
--with-toolexeclibdir=DIR
|
||||
install libraries built with a cross compiler within
|
||||
DIR
|
||||
--with-gcc-major-version-only
|
||||
use only GCC major number in filesystem paths
|
||||
|
||||
@ -12053,7 +12057,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12056 "configure"
|
||||
#line 12060 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12159,7 +12163,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<_LT_EOF
|
||||
#line 12162 "configure"
|
||||
#line 12166 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -15851,7 +15855,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
|
||||
# Fake what AC_TRY_COMPILE does.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15854 "configure"
|
||||
#line 15858 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef bool atomic_type;
|
||||
@ -15886,7 +15890,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15889 "configure"
|
||||
#line 15893 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef short atomic_type;
|
||||
@ -15921,7 +15925,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15924 "configure"
|
||||
#line 15928 "configure"
|
||||
int main()
|
||||
{
|
||||
// NB: _Atomic_word not necessarily int.
|
||||
@ -15957,7 +15961,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 15960 "configure"
|
||||
#line 15964 "configure"
|
||||
int main()
|
||||
{
|
||||
typedef long long atomic_type;
|
||||
@ -16110,7 +16114,7 @@ $as_echo "mutex" >&6; }
|
||||
# unnecessary for this test.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 16113 "configure"
|
||||
#line 16117 "configure"
|
||||
int main()
|
||||
{
|
||||
_Decimal32 d1;
|
||||
@ -16152,7 +16156,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
# unnecessary for this test.
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 16155 "configure"
|
||||
#line 16159 "configure"
|
||||
template<typename T1, typename T2>
|
||||
struct same
|
||||
{ typedef T2 type; };
|
||||
@ -16186,7 +16190,7 @@ $as_echo "$enable_int128" >&6; }
|
||||
rm -f conftest*
|
||||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 16189 "configure"
|
||||
#line 16193 "configure"
|
||||
template<typename T1, typename T2>
|
||||
struct same
|
||||
{ typedef T2 type; };
|
||||
@ -77837,6 +77841,22 @@ fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $version_specific_libs" >&5
|
||||
$as_echo "$version_specific_libs" >&6; }
|
||||
|
||||
|
||||
# Check whether --with-toolexeclibdir was given.
|
||||
if test "${with_toolexeclibdir+set}" = set; then :
|
||||
withval=$with_toolexeclibdir; case ${with_toolexeclibdir} in
|
||||
/)
|
||||
;;
|
||||
*/)
|
||||
with_toolexeclibdir=`echo $with_toolexeclibdir | sed 's,/$,,'`
|
||||
;;
|
||||
esac
|
||||
else
|
||||
with_toolexeclibdir=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Default case for install directory for include files.
|
||||
if test $version_specific_libs = no && test $gxx_include_dir = no; then
|
||||
gxx_include_dir='include/c++/${gcc_version}'
|
||||
@ -77867,7 +77887,14 @@ $as_echo "$version_specific_libs" >&6; }
|
||||
if test -n "$with_cross_host" &&
|
||||
test x"$with_cross_host" != x"no"; then
|
||||
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
|
||||
glibcxx_toolexeclibdir='${toolexecdir}/lib'
|
||||
case ${with_toolexeclibdir} in
|
||||
no)
|
||||
glibcxx_toolexeclibdir='${toolexecdir}/lib'
|
||||
;;
|
||||
*)
|
||||
glibcxx_toolexeclibdir=${with_toolexeclibdir}
|
||||
;;
|
||||
esac
|
||||
else
|
||||
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
|
||||
glibcxx_toolexeclibdir='${libdir}'
|
||||
|
@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/no-executables.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../config/unwind_ipinfo.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
|
@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/no-executables.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../config/unwind_ipinfo.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
|
@ -106,6 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
|
||||
$(top_srcdir)/../config/no-executables.m4 \
|
||||
$(top_srcdir)/../config/override.m4 \
|
||||
$(top_srcdir)/../config/stdint.m4 \
|
||||
$(top_srcdir)/../config/toolexeclibdir.m4 \
|
||||
$(top_srcdir)/../config/unwind_ipinfo.m4 \
|
||||
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \
|
||||
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user