summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-07-30 20:16:25 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-02 09:25:34 +0100
commitced919f6013fc0dbb8b8f75f87a8c0a4f416b1fe (patch)
tree1006fa994eba68ee6c229eb08af42888c9541408
parent226f17bfd2ceea7dc5784fbfaa8608f26b90d7f3 (diff)
downloadopenembedded-core-contrib-ced919f6013fc0dbb8b8f75f87a8c0a4f416b1fe.tar.gz
openembedded-core-contrib-ced919f6013fc0dbb8b8f75f87a8c0a4f416b1fe.tar.bz2
openembedded-core-contrib-ced919f6013fc0dbb8b8f75f87a8c0a4f416b1fe.zip
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@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-devtools/gcc/gcc-multilib-config.inc2
1 files changed, 1 insertions, 1 deletions
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