From 23c0e97b29afddff0a69dfc3406ad673e6a07cd8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=99=88=E5=B0=8F=20=E5=88=9A?= Date: Mon, 23 Jul 2018 06:54:18 +0000 Subject: [PATCH] toolchain-external: anchor sysroot regex with / MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Anchor the regex in toolchain_find_sysroot macro with a / to avoid unexpected substitution for Realtek mips toolchain, for which the libc.a path ends with 'mips-linux-uclibc/lib/libc.a'. Signed-off-by: 陈小 刚 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index baf719ad1f..e618aa7a09 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -331,7 +331,7 @@ endef # # And variations on these. define toolchain_find_sysroot -$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a::') +$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:/(usr/)?lib(32|64)?([^/]*)?/([^/]*/)?libc\.a::') endef # Returns the lib subdirectory for the given compiler + flags (i.e -- 2.30.2