| commit | 55d4a46f6da08b248a467097d56a2762d47d7043 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jun 29 20:37:13 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jun 29 20:37:13 2016 +0000 |
| tree | 8b82040c32d7a15284c495039e116c0ebb23a8d1 | |
| parent | 1767d3f9184db002a4417a6a64f99fbe622edbb2 [diff] | |
| parent | 88225fdfbe67316f38f9b3a716e6688b722a26f4 [diff] |
Merge "Detect `uname -m` == i686 as a 32-bit host"
diff --git a/core/envsetup.mk b/core/envsetup.mk index 49ca154..26042fa 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk
@@ -78,7 +78,7 @@ 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