From 0de9a53a340321de5d51b4092181d157c3b539ef Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 1 Aug 2019 16:53:36 +0200 Subject: [PATCH] toolchain-external: fix find_sysroot MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 23c0e97b29a (toolchain-external: anchor sysroot regex with /) tried to make the find-sysroot work more consistently, especially for toolchains where the C library is located in a sub-directory, like the "Realtek mips toolchain". After that patch, the '/' that was trailing in the returned path got removed now. This in turn breaks the Codesourcery toolchain. We fix that by appending the now-missing trailing '/'. Fixes: http://autobuild.buildroot.net/results/9284d571668148febce23d96a9c0a97a6b2b43dc Signed-off-by: Yann E. MORIN Cc: 陈小 刚 Cc: Arnout Vandecappelle 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 e618aa7a09..894e76ee32 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