libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Fixup last shlibpath_override test


From: Ralf Wildenhues
Subject: Fixup last shlibpath_override test
Date: Mon, 18 Sep 2006 07:49:53 +0200
User-agent: Mutt/1.5.13 (2006-09-01)

D'oh.  Applied to fix my bogus commit.  Sorry about that.

Cheers,
Ralf

        * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [ linux ]
        [k*bsd*-gnu ]: Fix brown paper bag: save and restore `libdir'.

Index: libltdl/m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.84
diff -u -r1.84 libtool.m4
--- libltdl/m4/libtool.m4       17 Sep 2006 19:30:15 -0000      1.84
+++ libltdl/m4/libtool.m4       18 Sep 2006 05:47:27 -0000
@@ -2277,12 +2277,14 @@
   shlibpath_overrides_runpath=no
   # Some binutils ld are patched to set DT_RUNPATH 
   save_LDFLAGS=$LDFLAGS
-  libdir=/foo wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) \
-  eval LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"
+  save_libdir=$libdir
+  eval libdir=/foo wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) \
+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"
   AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
     [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep 
"RUNPATH.*$libdir"],
        [shlibpath_overrides_runpath=yes])])
   LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install




reply via email to

[Prev in Thread] Current Thread [Next in Thread]