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

Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"

Browse Source
This commit is contained in:
Joe Onorato
2012-07-25 17:56:24 -07:00
committed by android code review
parent c22da7d7e2 e35a445f2f
commit c11b5efa3a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/main.mk
View File

@@ -84,7 +84,7 @@ 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 := 2 VERSION_CHECK_SEQUENCE_NUMBER := 3
-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))
@@ -162,12 +162,10 @@ GCC_REALPATH = $(realpath $(shell which gcc))
ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),) ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),)
# Using LLVM GCC results in a non functional emulator due to it # Using LLVM GCC results in a non functional emulator due to it
# not honouring global register variables # not honouring global register variables
ifneq ($(strip $(BUILD_EMULATOR)),) $(warning ****************************************)
$(warning ****************************************) $(warning * gcc is linked to llvm-gcc which will *)
$(warning * gcc is linked to llvm-gcc which will *) $(warning * not create a useable emulator. *)
$(warning * not create a useable emulator. *) $(warning ****************************************)
$(warning ****************************************)
endif
BUILD_EMULATOR := false BUILD_EMULATOR := false
else else
BUILD_EMULATOR := true BUILD_EMULATOR := true
@@ -193,6 +191,8 @@ endif
$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \ $(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \
> $(OUT_DIR)/versions_checked.mk) > $(OUT_DIR)/versions_checked.mk)
$(shell echo 'BUILD_EMULATOR := $(BUILD_EMULATOR)' \
>> $(OUT_DIR)/versions_checked.mk)
endif endif
# These are the modifier targets that don't do anything themselves, but # These are the modifier targets that don't do anything themselves, but