multilib.conf: set MULTILIB_GLOBAL_VARIANTS conditionally

It is not entirely obvious that all reasonable configurations
will have multilib.conf strictly before the file which might
want to set MULTILIB_GLOBAL_VARIANTS. The x86-ish values here
look like reasonable default guesses, but shouldn't override
an explicit setting.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 733236d6bbc7cc0bb32fae3764c2ffe8839d2dc2..37e8481112f017ade6352a6e5fee7c02696c43e4 100644 (file)
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -14,6 +14,6 @@ INHERIT += "multilib_global"
 
 BBCLASSEXTEND_append = " ${MULTILIBS}"
 
-MULTILIB_GLOBAL_VARIANTS  = "lib32 lib64 libx32"
+MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32"
 
 OPKG_ARGS_append = " --force-maintainer --force-overwrite"