commit e556005331b004498b4972f55f04a0e2a905d11c
author Ying Wang <wangying@google.com> Fri Jun 08 09:37:54 2012 -0700
committer Ying Wang <wangying@google.com> Fri Jun 08 09:37:54 2012 -0700
tree 8113c26cd49dd0c1b7e53c9ddbfbf16cd0bd12cf
parent 10f775379d4e9a9f4a5af79484c9f1e337dfab4b
parent 5c0ee702d61b030552c9907f6ddb3eb0470a009a

resolved conflicts for merge of 5c0ee702 to master

Change-Id: I6bdcc87482c45988d410a4c4d0abc43a1416277e

core/combo/HOST_darwin-x86.mk

diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk
index f32f9a3..19a1e89 100644
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@ -34,6 +34,7 @@
 HOST_GLOBAL_LDFLAGS += -static
 endif # BUILD_HOST_static
 
+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)),)