Merge "Provide default variant for x86."
diff --git a/core/combo/linux-x86.mk b/core/combo/linux-x86.mk
index f466147..629e0cc 100644
--- a/core/combo/linux-x86.mk
+++ b/core/combo/linux-x86.mk
@@ -1,6 +1,11 @@
 # Configuration for Linux on x86.
 # Included by combo/select.make
 
+# Provide a default variant.
+ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
+TARGET_ARCH_VARIANT := x86
+endif
+
 # right now we get these from the environment, but we should
 # pick them from the tree somewhere
 $(combo_target)CC := $(CC)