diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-11-09 10:28:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-09 10:28:36 -0800 |
| commit | fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1 (patch) | |
| tree | 66560b1b15c06e1db31f93160bc2f052bdbe172d /core/main.mk | |
| parent | dde4fc127c3c18531a1da9d3c72d1467979b413a (diff) | |
| parent | 2ea957a373018ba6773c621065164256f0d84078 (diff) | |
| download | build-fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1.zip build-fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1.tar.gz build-fc76f0eb17c606eb6df639d7a6c2f4ef2f3e09f1.tar.bz2 | |
am 2ea957a3: Merge "Revise checks for MacOSX to build emulator"
* commit '2ea957a373018ba6773c621065164256f0d84078':
Revise checks for MacOSX to build emulator
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/core/main.mk b/core/main.mk index e2adb00..0c70d92 100644 --- a/core/main.mk +++ b/core/main.mk @@ -158,7 +158,7 @@ $(error stop) endif ifeq (darwin,$(HOST_OS)) -GCC_REALPATH = $(realpath $(shell which gcc)) +GCC_REALPATH = $(realpath $(shell which $(HOST_CC))) ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),) # Using LLVM GCC results in a non functional emulator due to it # not honouring global register variables @@ -170,23 +170,6 @@ ifneq ($(findstring llvm-gcc,$(GCC_REALPATH)),) 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 else # HOST_OS is not darwin BUILD_EMULATOR := true endif # HOST_OS is darwin |