From fb8e2a860e0b61e27e5af114d83939720f11de2d Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 30 Jul 2014 20:16:25 -0500 Subject: [PATCH] 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... (From OE-Core rev: ced919f6013fc0dbb8b8f75f87a8c0a4f416b1fe) Signed-off-by: Mark Hatle Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- 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 b8c705a590..61340979ba 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