summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.6.inc1
-rw-r--r--meta/recipes-devtools/libtool/libtool/0001-libtool-Check-for-static-libs-for-internal-compiler-.patch37
2 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
index f307a10751..8e17b56d46 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
20 file://nohardcodepaths.patch \ 20 file://nohardcodepaths.patch \
21 file://unwind-opt-parsing.patch \ 21 file://unwind-opt-parsing.patch \
22 file://0001-libtool-Fix-support-for-NIOS2-processor.patch \ 22 file://0001-libtool-Fix-support-for-NIOS2-processor.patch \
23 file://0001-libtool-Check-for-static-libs-for-internal-compiler-.patch \
23 " 24 "
24 25
25SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" 26SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e"
diff --git a/meta/recipes-devtools/libtool/libtool/0001-libtool-Check-for-static-libs-for-internal-compiler-.patch b/meta/recipes-devtools/libtool/libtool/0001-libtool-Check-for-static-libs-for-internal-compiler-.patch
new file mode 100644
index 0000000000..8c7c39feb6
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/0001-libtool-Check-for-static-libs-for-internal-compiler-.patch
@@ -0,0 +1,37 @@
1From 40a2da75e6d95cc7c498ebda95ab19ae0db2ebfb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 26 Jan 2019 12:54:26 -0800
4Subject: [PATCH] libtool: Check for static libs for internal compiler
5 libraries
6
7Libtool checks only for libraries linked as -l* when trying to
8find internal compiler libraries. Clang, however uses the absolute
9path to link its internal libraries e.g. compiler_rt. This patch
10handles clang's statically linked libraries when finding internal
11compiler libraries.
12
13https://crbug.com/749263
14
15Upstream-Status: Submitted [https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866]
16
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 m4/libtool.m4 | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/m4/libtool.m4 b/m4/libtool.m4
23index d0389a0..9619c57 100644
24--- a/m4/libtool.m4
25+++ b/m4/libtool.m4
26@@ -7536,7 +7536,7 @@ if AC_TRY_EVAL(ac_compile); then
27 for p in `eval "$output_verbose_link_cmd"`; do
28 case $prev$p in
29
30- -L* | -R* | -l*)
31+ -L* | -R* | -l* | */libclang_rt.*.a)
32 # Some compilers place space between "-{L,R}" and the path.
33 # Remove the space.
34 if test x-L = "$p" ||
35--
362.20.1
37