am 0d205521: Merge "Enforce 64-bit build environment" into gingerbread
Merge commit '0d205521ae4e8907bcc80774260a68c923970eca' into gingerbread-plus-aosp * commit '0d205521ae4e8907bcc80774260a68c923970eca': Enforce 64-bit build environment
This commit is contained in:
commit
1599ddd085
13
core/main.mk
13
core/main.mk
|
@ -64,12 +64,23 @@ include $(BUILD_SYSTEM)/config.mk
|
||||||
# be generated correctly
|
# be generated correctly
|
||||||
include $(BUILD_SYSTEM)/cleanbuild.mk
|
include $(BUILD_SYSTEM)/cleanbuild.mk
|
||||||
|
|
||||||
VERSION_CHECK_SEQUENCE_NUMBER := 1
|
VERSION_CHECK_SEQUENCE_NUMBER := 2
|
||||||
-include $(OUT_DIR)/versions_checked.mk
|
-include $(OUT_DIR)/versions_checked.mk
|
||||||
ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
|
ifneq ($(VERSION_CHECK_SEQUENCE_NUMBER),$(VERSIONS_CHECKED))
|
||||||
|
|
||||||
$(info Checking build tools versions...)
|
$(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),windows)
|
||||||
ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
|
ifneq ($(HOST_OS)-$(HOST_ARCH),darwin-ppc)
|
||||||
# check for a case sensitive file system
|
# check for a case sensitive file system
|
||||||
|
|
Loading…
Reference in New Issue