From d8aa73a87fd4ce4c8b792dc8a42b09a91b1a9732 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 9 Nov 2005 22:19:39 +0000 Subject: [PATCH] * 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 . --- libtool.m4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libtool.m4 b/libtool.m4 index 86dfb99c5..5c08f7d6b 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1743,6 +1743,11 @@ uts4*) 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 @@ -6064,11 +6069,6 @@ EOF 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? # -- 2.47.3