aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2014-10-23 16:42:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-30 13:00:32 +0000
commit2645c07892abe79f73379b1ca4196f593cb3b330 (patch)
treeae173b8b866b9ad8cb8577206e27410034ea7d17
parent4cf539e67333ba2c3fe924b092e104da53e68ca0 (diff)
downloadopenembedded-core-contrib-2645c07892abe79f73379b1ca4196f593cb3b330.tar.gz
openembedded-core-contrib-2645c07892abe79f73379b1ca4196f593cb3b330.tar.bz2
openembedded-core-contrib-2645c07892abe79f73379b1ca4196f593cb3b330.zip
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>
-rw-r--r--meta/conf/multilib.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 733236d6bb..37e8481112 100644
--- 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"