diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2014-07-30 20:16:25 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-02 09:26:17 +0100 |
commit | fb8e2a860e0b61e27e5af114d83939720f11de2d (patch) | |
tree | 7afa299021a42daddcabbeff94084a261d332576 /meta/recipes-devtools | |
parent | bfb23e603825d00d214ac58de6df5e4764832edf (diff) | |
download | poky-fb8e2a860e0b61e27e5af114d83939720f11de2d.tar.gz |
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 <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-multilib-config.inc | 2 |
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() { | |||
152 | if mlprefix: | 152 | if mlprefix: |
153 | mlindex = 0 | 153 | mlindex = 0 |
154 | for ml in multilibs: | 154 | for ml in multilibs: |
155 | if mlprefix.startswith(ml): | 155 | if mlprefix == ml + '-': |
156 | break | 156 | break |
157 | mlindex += 1 | 157 | mlindex += 1 |
158 | 158 | ||