commit 0d205521ae4e8907bcc80774260a68c923970eca
author Ying Wang <wangying@google.com> Fri Jul 09 13:30:14 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 09 13:30:14 2010 -0700
tree 7ec3cec226fbfa1bf152550d7d4ed1554b46f315
parent 38d2e1dacd7c69f980a03184084469b5096edd9e
parent d2e830b9b408b95df46f628f33ced3dcbd6975d8

Merge "Enforce 64-bit build environment" into gingerbread

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index b79e2ea..8c9393e 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -64,12 +64,23 @@
 # be generated correctly
 include $(BUILD_SYSTEM)/cleanbuild.mk
 
-VERSION_CHECK_SEQUENCE_NUMBER := 1
+VERSION_CHECK_SEQUENCE_NUMBER := 2
 -include $(OUT_DIR)/versions_checked.mk
 ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
 
 $(info Checking build tools versions...)
 
+ifeq ($(BUILD_OS),linux)
+build_arch := $(shell uname -m)
+ifneq (64,$(findstring 64,$(build_arch)))
+$(warning ************************************************************)
+$(warning You are attempting to build on a 32-bit system.)
+$(warning Only 64-bit build environments are supported now.)
+$(warning ************************************************************)
+$(error stop)
+endif
+endif
+
 ifneq ($(HOST_OS),windows)
 ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
 # check for a case sensitive file system