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

am c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."

Browse Source 
* commit 'c22da7d7e2de0b4cbeefb533990d81581d19432a':
  Don't try to build the emulator on Mac OS if the right tools aren't installed.
This commit is contained in:
Joe Onorato
2012-07-25 22:22:14 -07:00
committed by Android Git Automerger
parent c759e46899 c22da7d7e2
commit e3adc7fdcc
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/main.mk
View File

@@ -162,11 +162,33 @@ 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 endif
BUILD_EMULATOR := false
else
BUILD_EMULATOR := true
endif
# When building on Leopard or above, we need to use the 10.4 SDK
# or the generated binary will not run on Tiger.
darwin_version := $(strip $(shell sw_vers -productVersion))
ifneq ($(filter 10.1 10.2 10.3 10.1.% 10.2.% 10.3.% 10.4 10.4.%,$(darwin_version)),)
$(error Building the Android emulator requires OS X 10.5 or above)
endif
ifneq ($(filter 10.5 10.5.% 10.6 10.6.%,$(darwin_version)),)
# We are on Leopard or Snow Leopard
MSDK=10.5
else
# We are on Lion or beyond, and 10.6 SDK is the minimum in Xcode 4.x
MSDK=10.6
endif
MACOSX_SDK := /Developer/SDKs/MacOSX$(MSDK).sdk
ifeq ($(strip $(wildcard $(MACOSX_SDK))),)
BUILD_EMULATOR := false
endif
endif endif
$(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \ $(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \