[oe-commits] Mark Hatle : gcc: Fix gcc-multilib-config comparison

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ced919f6013fc0dbb8b8f75f87a8c0a4f416b1fe
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ced919f6013fc0dbb8b8f75f87a8c0a4f416b1fe

Author: Mark Hatle <mark.hatle at windriver.com>
Date:   Wed Jul 30 20:16:25 2014 -0500

gcc: Fix gcc-multilib-config comparison

Fix an issue on a multilib configuration that contains more then 1 multilib.

I.e. on MIPS64:

DEFAULTTUNE = "mips64"
MULTILIBS = "lib32n:mips64_n32 lib32:mips32"

While normally you'd use 'libn32', the above is legal.

With the startswith code, the system will look to expand the 'lib32' element
and find the 'lib32n' instead, and will result in a warning:

lib32 doesn't have a corresponding tune. Skipping...

Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-devtools/gcc/gcc-multilib-config.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index b8c705a..6134097 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -152,7 +152,7 @@ python gcc_multilib_setup() {
     if mlprefix:
         mlindex = 0
         for ml in multilibs:
-            if mlprefix.startswith(ml):
+            if mlprefix == ml + '-':
                 break
             mlindex += 1