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

am: 55d4a46f6d Change-Id: Ia66952b98541755c55df1eb98775d749d2155dc1
2016-06-29 20:39:42 +00:00 · 2016-06-29 20:39:42 +00:00 · db9f3489bc
parent 85da4d3566 55d4a46f6d
commit db9f3489bc
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