diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2022-05-28 10:16:27 +0100 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2023-10-22 19:30:29 +0100 |
| commit | 8fe73ef2785837dbebee7c56d5f30211571b2773 (patch) | |
| tree | 974dcb3bb00a22b20a7cdc66103b78bfefed8a96 /gcc/configure | |
| parent | 6a6d3817afa02bbcd2388c8e005da6faf88932f1 (diff) | |
| download | gcc-8fe73ef2785837dbebee7c56d5f30211571b2773.zip gcc-8fe73ef2785837dbebee7c56d5f30211571b2773.tar.gz gcc-8fe73ef2785837dbebee7c56d5f30211571b2773.tar.bz2 | |
Darwin, rpaths: Add --with-darwin-extra-rpath.
This is provided to allow distributions to add a single additional
runpath to allow for cases where the installed GCC library directories
are then symlinked to a common dirctory outside of any of the GCC
installations.
For example:
/opt/distro/lib:
libgfortran.dylib -> /opt/distro/lib/gcc-11.3/lib/libgfortran.dylib
So that libraries which are designed to be found in the runpath we would then
add --with-darwin-add-rpath=/opt/distro/lib to the configure line.
This patch makes the configuration a little more forgiving of using
--disable-darwin-at-rpath (although for platform versions >= 10.11 this will
result in misconfigured target libraries).
gcc/ChangeLog:
* configure.ac: Add --with-darwin-extra-rpath option.
* config/darwin.h: Handle DARWIN_EXTRA_RPATH.
* config.in: Regenerate.
* configure: Regenerate.
Diffstat (limited to 'gcc/configure')
| -rwxr-xr-x | gcc/configure | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/gcc/configure b/gcc/configure index 13085f3..77f33ee 100755 --- a/gcc/configure +++ b/gcc/configure @@ -1012,6 +1012,7 @@ with_pic enable_fast_install enable_libtool_lock enable_darwin_at_rpath +with_darwin_extra_rpath enable_ld enable_gold with_plugin_ld @@ -1873,6 +1874,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-darwin-extra-rpath=[ARG] + Specify a runpath directory, additional to those + provided by the compiler --with-plugin-ld=[ARG] specify the plugin linker --with-glibc-version=M.N assume GCC used with glibc version M.N or later @@ -19976,7 +19980,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19979 "configure" +#line 19983 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -20082,7 +20086,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 20085 "configure" +#line 20089 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23410,6 +23414,26 @@ else ENABLE_DARWIN_AT_RPATH_FALSE= fi +DARWIN_DO_EXTRA_RPATH=0 + +# Check whether --with-darwin-extra-rpath was given. +if test "${with_darwin_extra_rpath+set}" = set; then : + withval=$with_darwin_extra_rpath; if test x"$withval" != x; then + DARWIN_ADD_RPATH="$withval" + DARWIN_DO_EXTRA_RPATH=1 + fi +fi + + +cat >>confdefs.h <<_ACEOF +#define DARWIN_DO_EXTRA_RPATH $DARWIN_DO_EXTRA_RPATH +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define DARWIN_ADD_RPATH "$DARWIN_ADD_RPATH" +_ACEOF + # Identify the assembler which will work hand-in-glove with the newly # built GCC, so that we can examine its features. This is the assembler |