StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 5c0ee702 to master

Browse Source 
Change-Id: I6bdcc87482c45988d410a4c4d0abc43a1416277e
This commit is contained in:
Ying Wang
2012-06-08 09:37:54 -07:00
parent 10f775379d 5c0ee702d6
commit e556005331
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/combo/HOST_darwin-x86.mk
View File

@@ -34,6 +34,7 @@ ifneq ($(strip $(BUILD_HOST_static)),)
HOST_GLOBAL_LDFLAGS += -static HOST_GLOBAL_LDFLAGS += -static
endif # BUILD_HOST_static endif # BUILD_HOST_static
build_mac_version := $(shell sw_vers -productVersion)
mac_sdk_version := 10.6 mac_sdk_version := 10.6
mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk
ifeq ($(wildcard $(mac_sdk_root)),) ifeq ($(wildcard $(mac_sdk_root)),)