[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Fix variables_saved_for_relink (was: uninitialized variables)
From: |
Ralf Wildenhues |
Subject: |
Fix variables_saved_for_relink (was: uninitialized variables) |
Date: |
Sun, 6 Nov 2005 19:40:19 +0100 |
User-agent: |
Mutt/1.5.9i |
* Ralf Wildenhues wrote on Sun, Nov 06, 2005 at 07:17:12PM CET:
> Given the need for an audit of macro ordering in libtool,
*snip*
D'oh. Mike actually reported that LD_LIBRARY_PATH should be
saved/restored when it wasn't..
OK to apply to branch-1-5 and forward-port?
Cheers,
Ralf
* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Move setting of
`variables_saved_for_relink'..
(AC_LIBTOOL_SYS_DYNAMIC_LINKER): here, when both `shlibpath_var'
and `runpath_var' have been set.
Reported by Mike Frysinger <address@hidden>.
Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.123
diff -u -r1.314.2.123 libtool.m4
--- libtool.m4 6 Nov 2005 13:02:21 -0000 1.314.2.123
+++ libtool.m4 6 Nov 2005 17:56:42 -0000
@@ -1743,6 +1743,11 @@
esac
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX
COMPILER_PATH LIBRARY_PATH"
+fi
])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
@@ -6086,11 +6088,6 @@
AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX
COMPILER_PATH LIBRARY_PATH"
-fi
-
#
# Do we need to explicitly link libc?
#