aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2019-08-01 16:53:36 +0200
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-08-01 17:35:22 +0200
commit0de9a53a340321de5d51b4092181d157c3b539ef (patch)
tree276764e87c1c37d79b459302b0ffe76f46b9ff41
parentaa4474e999295c55744243379009621fcb06ae75 (diff)
downloadbuildroot-0de9a53a340321de5d51b4092181d157c3b539ef.tar.gz
buildroot-0de9a53a340321de5d51b4092181d157c3b539ef.tar.bz2
toolchain-external: fix find_sysroot
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 <yann.morin.1998@free.fr> Cc: 陈小 刚 <shawn_chen@realsil.com.cn> Cc: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-rw-r--r--toolchain/toolchain-external/pkg-toolchain-external.mk2
1 files changed, 1 insertions, 1 deletions
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