StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enforce 64-bit build environment" into gingerbread

Browse Source
This commit is contained in:
Ying Wang
2010-07-09 13:30:14 -07:00
committed by Android (Google) Code Review
parent 38d2e1dacd d2e830b9b4
commit 0d205521ae
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/main.mk
View File

@@ -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