]> code.ossystems Code Review - openembedded-core.git/commitdiff
gcc: Fix gcc-multilib-config comparison
authorMark Hatle <mark.hatle@windriver.com>
Thu, 31 Jul 2014 01:16:25 +0000 (20:16 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 2 Aug 2014 08:25:34 +0000 (09:25 +0100)
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@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-devtools/gcc/gcc-multilib-config.inc

index b8c705a590bf9f1f92ea38df52d42f3a64796520..61340979ba18de8e09701c70bfabcc82be8a21f5 100644 (file)
@@ -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