llvm-project-source: Emit all default MULTILIB_GLOBAL_VARIANTS

This ensures that signature of do_patch does not change between multilib
and non-multilib builds of clang-native, this essentially hardcodes the
multilib variants to lib32 lib64 libx32 which is 99.9% usecase, if you
fall into 0.1% then go ahead and modify MULTILIB_VARIANTS in a bbappend
file and it will be fine.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 2979956a6925c5a167de451fc804738e96d41637)

1 files changed, 3 insertions, 2 deletions

diff --git a/recipes-devtools/clang/llvm-project-source.inc b/recipes-devtools/clang/llvm-project-source.inc
index a840030..4afd1bb 100644
--- a/recipes-devtools/clang/llvm-project-source.inc
+++ b/recipes-devtools/clang/llvm-project-source.inc
@@ -26,13 +26,14 @@ CLANG_EXTRA_OE_VENDORS ?= "${TARGET_VENDOR} ${SDK_VENDOR}"
 # ":" separated the ID in "/etc/os-release" and the triple for finding gcc on this OE DISTRO.
 # eg: "poky:poky wrlinux:wrs"
 CLANG_EXTRA_OE_DISTRO ?= "poky:poky"
-
+# Match with MULTILIB_GLOBAL_VARIANTS
+MULTILIB_VARIANTS = "lib32 lib64 libx32"
 python add_distro_vendor() {
     import subprocess
     case = ""
     triple = ""
     vendors = d.getVar('CLANG_EXTRA_OE_VENDORS')
-    multilib_variants = (d.getVar("MULTILIB_GLOBAL_VARIANTS") or "").split()
+    multilib_variants = (d.getVar("MULTILIB_VARIANTS") or "").split()
     vendors_to_add = []
     for vendor in vendors.split():
         # convert -yoe into yoe