diff --git a/core/envsetup.mk b/core/envsetup.mk
index 49ca154b1..26042fa0f 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -78,7 +78,7 @@ ifneq (,$(findstring x86_64,$(UNAME)))
   HOST_2ND_ARCH := x86
   HOST_IS_64_BIT := true
 else
-ifneq (,$(findstring x86,$(UNAME)))
+ifneq (,$(findstring i686,$(UNAME))$(findstring x86,$(UNAME)))
 $(error Building on a 32-bit x86 host is not supported: $(UNAME)!)
 endif
 endif