resolved conflicts for merge of 5c0ee702
to master
Change-Id: I6bdcc87482c45988d410a4c4d0abc43a1416277e
This commit is contained in:
@@ -34,6 +34,7 @@ ifneq ($(strip $(BUILD_HOST_static)),)
|
||||
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)),)
|
||||
|
Reference in New Issue
Block a user