summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorYing Wang <wangying@android.com>2012-06-08 09:27:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-08 09:27:08 -0700
commit5c0ee702d61b030552c9907f6ddb3eb0470a009a (patch)
tree2252ec6c47862a76ee9ef667e7232c68983ed619 /core
parentfe8cddea28bc5a5266ede2bd10b482dbe840c0bf (diff)
parent79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b (diff)
downloadbuild-5c0ee702d61b030552c9907f6ddb3eb0470a009a.zip
build-5c0ee702d61b030552c9907f6ddb3eb0470a009a.tar.gz
build-5c0ee702d61b030552c9907f6ddb3eb0470a009a.tar.bz2
am 79d39a30: am 874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"
* commit '79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b': Fix generic build on Max OS X 10.7 Lion
Diffstat (limited to 'core')
-rw-r--r--core/combo/HOST_darwin-x86.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk
index 2ad3dd9..4602356 100644
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@ -29,6 +29,7 @@ HOST_GLOBAL_CFLAGS += -m32
HOST_GLOBAL_LDFLAGS += -m32
endif # BUILD_HOST_64bit
+build_mac_version := $(shell sw_vers -productVersion)
mac_sdk_version := 10.6
mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk
ifeq ($(wildcard $(mac_sdk_root)),)