[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Make use of $inherited_linker_flags
From: |
Albert Chin |
Subject: |
Make use of $inherited_linker_flags |
Date: |
Tue, 14 Dec 2004 11:15:45 -0600 |
User-agent: |
Mutt/1.5.6i |
Make use of $inherited_linker_flags in .la files. Patch against
branch-2-0.
--
albert chin (address@hidden)
-- snip snip
2004-12-14 Albert Chin-A-Young <address@hidden>
* config/ltmain.m4sh: Make use of new
$inherited_linker_flags variable in .la files.
Index: config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/config/ltmain.m4sh,v
retrieving revision 1.1.2.26
diff -u -3 -p -r1.1.2.26 ltmain.m4sh
--- config/ltmain.m4sh 9 Dec 2004 17:59:39 -0000 1.1.2.26
+++ config/ltmain.m4sh 14 Dec 2004 17:18:49 -0000
@@ -3105,6 +3105,12 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
+ if test "$linkmode" = lib; then
+ case "$inherited_linker_flags " in
+ *" $deplib "*) ;;
+ *) inherited_linker_flags="$inherited_linker_flags $deplib" ;;
+ esac
+ fi
fi
continue
;;
@@ -3182,11 +3188,11 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- if test "$linkmode" = lib ; then
- case "$inherited_linker_flags " in
- *" $deplib "*) ;;
- * ) inherited_linker_flags="$inherited_linker_flags
$deplib" ;;
- esac
+ if test "$linkmode" = lib; then
+ case "$inherited_linker_flags " in
+ *" $deplib "*) ;;
+ *) inherited_linker_flags="$inherited_linker_flags $deplib" ;;
+ esac
fi
fi
continue
@@ -3355,6 +3361,7 @@ func_mode_link ()
{ test "$linkmode" != prog && test "$linkmode" != lib; }; then
test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ test -n "$inherited_linker_flags" && deplibs="$inherited_linker_flags
$deplibs"
fi
if test "$pass" = conv; then
- Make use of $inherited_linker_flags,
Albert Chin <=