From: Peter Rosin Date: Thu, 10 Sep 2009 07:51:15 +0000 (+0200) Subject: func_win32_libid doesn't work with MS dumpbin X-Git-Tag: v2.2.7b~59 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a4f0d3958890c6d3ac1ff626b17586845d262bb;p=thirdparty%2Flibtool.git func_win32_libid doesn't work with MS dumpbin * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD): The $NM interface is assumed to be BSD nm in func_win32_libid, so check for that before using it. Signed-off-by: Peter Rosin --- diff --git a/ChangeLog b/ChangeLog index d3e924fee..a12d76440 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-09-10 Peter Rosin + + func_win32_libid doesn't work with MS dumpbin + * libltdl/m4/libtool.m4 (_LT_CHECK_MAGIC_METHOD): The $NM + interface is assumed to be BSD nm in func_win32_libid, so + check for that before using it. + 2009-09-07 Ralf Wildenhues Allow dlopen self test to work with gcc's -fvisibility=hidden. diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 662a88b12..bebce6b66 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -2989,7 +2989,8 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else