mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-03-07 15:37:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix AIX testsuite regression

Browse Source 
* libltdl/config/ltmain.m4sh (func_resolve_sysroot): Partly
revert v2.2.10-83-gc45a288: Do not absolutize path here, only do
sysroot replacement.
(func_mode_link): Adjust.
This commit is contained in:
Ralf Wildenhues 2010-08-22 09:42:51 +02:00 committed by Paolo Bonzini
parent 2bde23f84f
commit a1d74f242c
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libltdl/config/ltmain.m4sh
View File

@ -547,31 +547,16 @@ func_source ()
# func_resolve_sysroot PATH
# Change PATH to an absolute path or replace a leading = with a
# sysroot. Store the result into func_resolve_sysroot_result
# Replace a leading = in PATH with a sysroot. Store the result into
# func_resolve_sysroot_result
func_resolve_sysroot ()
{
func_resolve_sysroot_result=$1
case $func_resolve_sysroot_result in
[\\/]* | [A-Za-z]:[\\/]*) ;;
=*)
func_stripname '=' '' "$func_resolve_sysroot_result"
func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
;;
*)
if test -d "$1"; then
absdir=`cd "$1" && pwd`
test -z "$absdir" && \
func_fatal_error "cannot determine absolute directory name of \`$dir'"
func_resolve_sysroot_result=`cd "$dir" && pwd`
else
func_dirname_and_basename "$1" "" "."
absdir=`cd "$func_dirname_result" && pwd`
test -z "$absdir" && \
func_fatal_error "cannot determine absolute directory name of \`$func_dirname_result'"
func_resolve_sysroot_result="$absdir/$func_basename_result"
fi
;;
esac
}
@ -4443,6 +4428,16 @@ func_mode_link ()
fi
func_resolve_sysroot "$func_stripname_result"
dir=$func_resolve_sysroot_result
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
func_fatal_error "cannot determine absolute directory name of \`$dir'"
dir="$absdir"
;;
esac
case "$deplibs " in
*" -L$dir "* | *" $arg "*)
# Will only happen for absolute or sysroot arguments