PWN-Hunter/android_build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Mac OS X SDK 10.6.

Browse Source 
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
This commit is contained in:
Ying Wang 2012-05-25 15:14:12 -07:00 committed by Jean-Baptiste Queru
parent fed2587c16
commit 644dc164cc
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CleanSpec.mk
View File

@ -109,6 +109,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libbcinfo_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libbcinfo_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# Now we switched to build against Mac OS X SDK 10.6
$(call add-clean-step, rm -rf $(OUT_DIR)/host/darwin-x86/obj)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

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

@ -23,21 +23,17 @@
HOST_GLOBAL_CFLAGS += -m32 HOST_GLOBAL_CFLAGS += -m32
HOST_GLOBAL_LDFLAGS += -m32 HOST_GLOBAL_LDFLAGS += -m32
# Use the Mac OSX SDK 10.5 if the build host is 10.6 mac_sdk_version := 10.6
build_mac_version := $(shell sw_vers -productVersion) mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk
ifneq ($(filter 10.6.%, $(build_mac_version)),) ifeq ($(wildcard $(mac_sdk_root)),)
sdk_105_root := /Developer/SDKs/MacOSX10.5.sdk
ifeq ($(wildcard $(sdk_105_root)),)
$(warning *****************************************************) $(warning *****************************************************)
$(warning * You are building on Mac OSX 10.6.) $(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root))
$(warning * Can not find SDK 10.5 at $(sdk_105_root))
$(warning *****************************************************) $(warning *****************************************************)
$(error Stop.) $(error Stop.)
endif endif
HOST_GLOBAL_CFLAGS += -isysroot $(sdk_105_root) -mmacosx-version-min=10.5 HOST_GLOBAL_CFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)
HOST_GLOBAL_LDFLAGS += -isysroot $(sdk_105_root) -mmacosx-version-min=10.5 HOST_GLOBAL_LDFLAGS += -isysroot $(mac_sdk_root) -mmacosx-version-min=$(mac_sdk_version)
endif # build_mac_version is 10.6
HOST_GLOBAL_CFLAGS += -fPIC HOST_GLOBAL_CFLAGS += -fPIC
HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error HOST_NO_UNDEFINED_LDFLAGS := -Wl,-undefined,error