Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 1 | From: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 2 | Subject: [PATCH 08/12] libtool: Check for static libs for internal compiler libraries |
| 3 | |
| 4 | Libtool checks only for libraries linked as -l* when trying to |
| 5 | find internal compiler libraries. Clang, however uses the absolute |
| 6 | path to link its internal libraries e.g. compiler_rt. This patch |
| 7 | handles clang's statically linked libraries when finding internal |
| 8 | compiler libraries. |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 12 | |
| 13 | https://crbug.com/749263 |
| 14 | https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866 |
| 15 | |
| 16 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 17 | |
| 18 | diff --git a/m4/libtool.m4 b/m4/libtool.m4 |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 19 | index 180dd9d1..022c1292 100644 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 20 | --- a/m4/libtool.m4 |
| 21 | +++ b/m4/libtool.m4 |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 22 | @@ -7560,7 +7560,7 @@ if AC_TRY_EVAL(ac_compile); then |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 23 | for p in `eval "$output_verbose_link_cmd"`; do |
| 24 | case $prev$p in |
| 25 | |
| 26 | - -L* | -R* | -l*) |
| 27 | + -L* | -R* | -l* | */libclang_rt.*.a) |
| 28 | # Some compilers place space between "-{L,R}" and the path. |
| 29 | # Remove the space. |
| 30 | if test x-L = "$p" || |
| 31 | -- |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 32 | 2.25.1 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 33 | |