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

handle sysrooted paths when reading dependencies to la files

Browse Source 
* libltdl/config/ltmain.m4sh (func_mode_execute, func_mode_install,
func_mode_link): Whenever a .la file occurs in another .la file,
expand the sysroot path in it.

Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
This commit is contained in:
Paolo Bonzini 2010-07-29 00:00:12 +02:00
parent c45a288134
commit adb8f844f3
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libltdl/config/ltmain.m4sh
View File

@ -1261,6 +1261,9 @@ func_mode_execute ()
dir=
case $file in
*.la)
func_resolve_sysroot "$file"
file=$func_resolve_sysroot_result
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
@ -1612,6 +1615,9 @@ func_mode_install ()
;;
*.la)
func_resolve_sysroot "$file"
file=$func_resolve_sysroot_result
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
@ -4778,16 +4784,17 @@ func_mode_link ()
*.la)
# A libtool-controlled library.
func_resolve_sysroot "$arg"
if test "$prev" = dlfiles; then
# This library was specified with -dlopen.
func_append dlfiles " $arg"
func_append dlfiles " $func_resolve_sysroot_result"
prev=
elif test "$prev" = dlprefiles; then
# The library was specified with -dlpreopen.
func_append dlprefiles " $arg"
func_append dlprefiles " $func_resolve_sysroot_result"
prev=
else
func_append deplibs " $arg"
func_append deplibs " $func_resolve_sysroot_result"
fi
continue
;;
@ -5113,7 +5120,10 @@ func_mode_link ()
deplibs="$deplib $deplibs"
continue
;;
*.la) lib="$deplib" ;;
*.la)
func_resolve_sysroot "$deplib"
lib=$func_resolve_sysroot_result
;;
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"