diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-31 11:29:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-31 15:15:12 +0100 |
| commit | c4b3540fc2b66730e021dd0b0c89b0fbe9dbf77a (patch) | |
| tree | 2e83fa0747fe1a96438900ddf4f03ac58073cea7 /meta/classes/multilib_global.bbclass | |
| parent | 753c98324ae82a67104eaf36e7ebf3553ee1dad7 (diff) | |
| download | openembedded-core-contrib-c4b3540fc2b66730e021dd0b0c89b0fbe9dbf77a.tar.gz | |
multilib_global: Fix PREFERRED_VERSION mapping for gcc-cross-canadian
Our multilib cross toolchains have <ml_prefix> as a prefix however we
only have a single gcc-cross-canadian for each arch and it is not
prefixed even in the multilib case. We can have two versions of
gcc-cross-canadian, 32 and 64 bit.
This fixes the multilib PREFERRED_VERSION mapping code so that
no prefix is added to the preferred version and therefore the
right versions of gcc-cross-canadian are used.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib_global.bbclass')
| -rw-r--r-- | meta/classes/multilib_global.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index ed34404117..612cfb6919 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass @@ -30,7 +30,10 @@ def preferred_ml_updates(d): override = ":virtclass-multilib-" + p localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) bb.data.update_data(localdata) - newname = localdata.expand(v).replace("PREFERRED_VERSION_", "PREFERRED_VERSION_" + p + '-') + if "-canadian-" in pkg: + newname = localdata.expand(v) + else: + newname = localdata.expand(v).replace("PREFERRED_VERSION_", "PREFERRED_VERSION_" + p + '-') if newname != v: newval = localdata.expand(val) d.setVar(newname, newval) |