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

* libltdl/config/ltmain.m4sh (func_win32_libid)

Browse Source 
[ cygwin, mingw ]: Robustify sed script to determine
win32_libid_type.
(func_mode_link) [ mingw ]: Ignore `-lm'.
This commit is contained in:
Alan W. Irwin 2005-09-25 07:35:58 +00:00 committed by Ralf Wildenhues
parent 5b25bb1115
commit d3d8151e28
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-09-25 Alan W. Irwin <irwin@beluga.phys.uvic.ca>,
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* libltdl/config/ltmain.m4sh (func_win32_libid)
[ cygwin, mingw ]: Robustify sed script to determine
win32_libid_type.
(func_mode_link) [ mingw ]: Ignore `-lm'.
2005-09-25 Peter Ekberg <peda@lysator.liu.se> 2005-09-25 Peter Ekberg <peda@lysator.liu.se>
* libltdl/libltdl/lt__private.h, libltdl/lt_error.c: * libltdl/libltdl/lt__private.h, libltdl/lt_error.c:

15
libltdl/config/ltmain.m4sh
View File

@ -681,12 +681,11 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
$EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | win32_nmres=`eval $NM -f posix -A $1 |
sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` sed -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
if test "X$win32_nmres" = "Ximport" ; then case $win32_nmres in
win32_libid_type="x86 archive import" import*) win32_libid_type="x86 archive import";;
else *) win32_libid_type="x86 archive static";;
win32_libid_type="x86 archive static" esac
fi
fi fi
;; ;;
*DLL*) *DLL*)
@ -2597,11 +2596,11 @@ func_mode_link ()
-l*) -l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in case $host in
*-*-cygwin* | *-*-pw32* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
# These systems don't actually have a C or math library (as such) # These systems don't actually have a C or math library (as such)
continue continue
;; ;;
*-*-mingw* | *-*-os2*) *-*-os2*)
# These systems don't actually have a C library (as such) # These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue test "X$arg" = "X-lc" && continue
;; ;;