blob: 0a1be0ec2ff95cd4e7536e155d96c8c30742ab46 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 03dabb6a70847761e65572a2a7b770a3b1b9f123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <mati865@gmail.com>
Date: Mon, 12 Apr 2021 23:44:10 +0200
Subject: [PATCH] Support llvm-objdump -f output
---
build-aux/ltmain.in | 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 a9f070a..4a434cc 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -3019,7 +3019,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..594be9c 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
|