From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 20 Aug 2020 08:01:15 +0000 (-0700)
Subject: gcc-cross-canadian: Correct the regexp to delete versioned gcc binary
X-Git-Tag: uninative-2.9~8
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ee2beaff701d02736c8244ebc76f6d6ca96a04f4;p=openembedded-core.git

gcc-cross-canadian: Correct the regexp to delete versioned gcc binary

After gcc 10 this expression needed to be adjusted, its better to use a
bitbake variable which we do have readily available

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 553ef7fe62..db17ae4685 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -106,7 +106,7 @@ do_install () {
 	rm -f ${D}${bindir}/*c++
 
 	# We don't care about the gcc-<version> copies
-	rm -f ${D}${bindir}/*gcc-?.?*
+	rm -f ${D}${bindir}/*gcc-${BINV}*
 
 	# Cleanup empty directories which are not shipped
 	# we use rmdir instead of 'rm -f' to ensure the non empty directories are not deleted