From 2645c07892abe79f73379b1ca4196f593cb3b330 Mon Sep 17 00:00:00 2001 From: Peter Seebach Date: Thu, 23 Oct 2014 16:42:10 -0500 Subject: 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 --- meta/conf/multilib.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit 1.2.3-korg