diff options
Diffstat (limited to 'meta/lib/oe/utils.py')
-rw-r--r-- | meta/lib/oe/utils.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 80f0442d0a..6aed6dc993 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py | |||
@@ -327,9 +327,15 @@ def host_gcc_version(d): | |||
327 | 327 | ||
328 | def get_multilib_datastore(variant, d): | 328 | def get_multilib_datastore(variant, d): |
329 | localdata = bb.data.createCopy(d) | 329 | localdata = bb.data.createCopy(d) |
330 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant | 330 | if variant: |
331 | localdata.setVar("OVERRIDES", overrides) | 331 | overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant |
332 | localdata.setVar("MLPREFIX", variant + "-") | 332 | localdata.setVar("OVERRIDES", overrides) |
333 | localdata.setVar("MLPREFIX", variant + "-") | ||
334 | else: | ||
335 | overrides = localdata.getVar("OVERRIDES", False).split(":") | ||
336 | overrides = ":".join([x for x in overrides if not x.startswith("virtclass-multilib-")]) | ||
337 | localdata.setVar("OVERRIDES", overrides) | ||
338 | localdata.setVar("MLPREFIX", "") | ||
333 | return localdata | 339 | return localdata |
334 | 340 | ||
335 | # | 341 | # |