40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From 1a4e74ef284f0944f474df5c28afd6c1737f66b6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <mati865@gmail.com>
|
|
Date: Sat, 10 Apr 2021 00:39:05 +0200
|
|
Subject: [PATCH] Support llvm-objdump -f output
|
|
|
|
---
|
|
build-aux/ltmain.sh | 2 +-
|
|
m4/libtool.m4 | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
|
|
index ff0690f..b35fe5e 100644
|
|
--- a/build-aux/ltmain.sh
|
|
+++ b/build-aux/ltmain.sh
|
|
@@ -4931,7 +4931,7 @@ func_win32_libid ()
|
|
*ar\ archive*) # could be an import, or static
|
|
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
|
|
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
|
|
- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
|
|
+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|coff-arm|coff-arm64|coff-i386|coff-x86-64)' >/dev/null; then
|
|
case $nm_interface in
|
|
"MS dumpbin")
|
|
if func_cygming_ms_implib_p "$1" ||
|
|
diff --git a/m4/libtool.m4 b/m4/libtool.m4
|
|
index 21a7d60..913ca5e 100644
|
|
--- a/m4/libtool.m4
|
|
+++ b/m4/libtool.m4
|
|
@@ -3473,7 +3473,7 @@ mingw* | pw32*)
|
|
lt_cv_file_magic_cmd='func_win32_libid'
|
|
else
|
|
# Keep this pattern in sync with the one in func_win32_libid.
|
|
- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
|
|
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|coff-arm|coff-arm64|coff-i386|coff-x86-64)'
|
|
lt_cv_file_magic_cmd='$OBJDUMP -f'
|
|
fi
|
|
;;
|
|
--
|
|
2.31.1
|
|
|