From 85937739d4fe5e06349a0bfff22365f04dc39a98 Mon Sep 17 00:00:00 2001 From: Al Sutton Date: Wed, 21 Dec 2011 13:14:03 -0800 Subject: Fix build under MacOS 10.7 / XCode 4 This is change of a check in the emulator build file so it only applies a rule when it's being run on 10.6 instead of what it currently does, which is apply the run to any build running on 10.5 and above. This is needed because it's the part of the emulator build which requires the 10.4 SDK, which, of course, isn't available under XCode 4; Change-Id: I4748cc4ac50c966a7add04e000aa665d4738ba62 --- Makefile.android | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.android') diff --git a/Makefile.android b/Makefile.android index e58f984..0d53f42 100644 --- a/Makefile.android +++ b/Makefile.android @@ -74,8 +74,8 @@ ifeq ($(HOST_OS),darwin) 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 - ifeq ($(filter 10.5 10.5.%,$(DARWIN_VERSION)),) - # We are on Snow Leopard or above + ifneq ($(filter 10.6 10.6.%,$(DARWIN_VERSION)),) + # We are on Snow Leopard LEOPARD_SDK := /Developer/SDKs/MacOSX10.5.sdk ifeq ($(strip $(wildcard $(LEOPARD_SDK))),) $(info Please install the 10.5 SDK on this machine at $(LEOPARD_SDK)) -- cgit v1.1