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

This commit is contained in:
Treehugger Robot 2016-06-29 20:37:13 +00:00 committed by Gerrit Code Review
commit 55d4a46f6d

View file

@ -78,7 +78,7 @@ ifneq (,$(findstring x86_64,$(UNAME)))
HOST_2ND_ARCH := x86 HOST_2ND_ARCH := x86
HOST_IS_64_BIT := true HOST_IS_64_BIT := true
else else
ifneq (,$(findstring x86,$(UNAME))) ifneq (,$(findstring i686,$(UNAME))$(findstring x86,$(UNAME)))
$(error Building on a 32-bit x86 host is not supported: $(UNAME)!) $(error Building on a 32-bit x86 host is not supported: $(UNAME)!)
endif endif
endif endif