From d778e2900aedc08d64fd535a121cc2e7bbfea4ae Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 15 Feb 2010 10:55:03 +0100 Subject: [PATCH] Fix deplibs check fallback for 64-bit Windows and Windows CE. Signed-off-by: Pierre Ossman --- ChangeLog | 4 ++++ libltdl/m4/libtool.m4 | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76c2b29..50e483c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-02-15 Pierre Ossman + Fix deplibs check fallback for 64-bit Windows and Windows CE. + * libltdl/m4/libtool.m4: Accept file formats 'pe-arm-wince' and + 'pe-x86-64'. + Make libltdl stop mangling preloaded names. * libltdl/ltdl.c: Store the original name for lookup in the preload table as that is what libtool puts in there, not the diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 29f1222..88acc65 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -3009,7 +3009,7 @@ mingw* | pw32*) lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -- 1.6.2.5