mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
- Part 1 of fixing problems with runpath switch (make --disable-rpath work for real)
This commit is contained in:
parent
c7d82c75c9
commit
56f88566e9
@ -323,6 +323,9 @@ else
|
||||
ld_runpath_switch=-L
|
||||
fi
|
||||
fi
|
||||
if test "$PHP_RPATH" = "no"; then
|
||||
ld_runpath_switch=
|
||||
fi
|
||||
])
|
||||
|
||||
dnl
|
||||
@ -447,7 +450,8 @@ AC_DEFUN([PHP_ADD_LIBPATH],[
|
||||
_PHP_ADD_LIBPATH_GLOBAL([$ai_p])
|
||||
],[
|
||||
if test "$ext_shared" = "yes"; then
|
||||
$2="$ld_runpath_switch$ai_p -L$ai_p [$]$2"
|
||||
$2="-L$ai_p [$]$2"
|
||||
test -n "$ld_runpath_switch" && $2="$ld_runpath_switch$ai_p [$]$2"
|
||||
else
|
||||
_PHP_ADD_LIBPATH_GLOBAL([$ai_p])
|
||||
fi
|
||||
|
@ -138,6 +138,10 @@ dnl Support systems with system libraries in e.g. /usr/lib64
|
||||
PHP_ARG_WITH(libdir, for system library directory,
|
||||
[ --with-libdir=NAME Look for libraries in .../NAME rather than .../lib],lib,no)
|
||||
|
||||
PHP_ARG_ENABLE(rpath, whether to enable runpaths,
|
||||
[ --disable-rpath Disable passing additional runtime library
|
||||
search paths], yes, no)
|
||||
|
||||
dnl check for -R, etc. switch
|
||||
PHP_RUNPATH_SWITCH
|
||||
|
||||
@ -755,10 +759,6 @@ else
|
||||
AC_DEFINE(PHP_SIGCHILD, 0, [ ])
|
||||
fi
|
||||
|
||||
PHP_ARG_ENABLE(rpath, whether to enable runpaths,
|
||||
[ --disable-rpath Disable passing additional runtime library
|
||||
search paths], yes, no)
|
||||
|
||||
PHP_ARG_ENABLE(libgcc, whether to explicitly link against libgcc,
|
||||
[ --enable-libgcc Enable explicitly linking against libgcc], no, no)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user