aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-06-29 12:26:53 -0700
committerDan Willemsen <dwillemsen@google.com>2016-06-29 12:30:56 -0700
commit88225fdfbe67316f38f9b3a716e6688b722a26f4 (patch)
tree8b82040c32d7a15284c495039e116c0ebb23a8d1
parent1767d3f9184db002a4417a6a64f99fbe622edbb2 (diff)
downloadbuild-88225fdfbe67316f38f9b3a716e6688b722a26f4.tar.gz
Detect `uname -m` == i686 as a 32-bit host
Change-Id: I0350629ce6ea7a5f0224489bafc98bc190e70932 Test: UNAME from https://groups.google.com/d/msg/android-building/nGQna2xuW5s/eEcXSo9ZBgAJ
-rw-r--r--core/envsetup.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 49ca154b12..26042fa0fd 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