Merge "Detect uname -m == i686 as a 32-bit host"

2016-06-29 20:37:13 +00:00
parent 1767d3f918 88225fdfbe
commit 55d4a46f6d
1 changed files with 1 additions and 1 deletions
--- 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