From 3a2b9f0a49078223434927835d79d1ca9a751f16 Mon Sep 17 00:00:00 2001 From: Naseer Ahmed Date: Thu, 16 Oct 2014 13:17:12 -0400 Subject: [PATCH] core: OSX: Support 10.9 SDK as well Change-Id: I764102df9b84ca19d217e35a209a9c80abeed6e7 --- core/combo/HOST_darwin-x86.mk | 4 ++-- core/combo/HOST_darwin-x86_64.mk | 4 ++-- core/combo/mac_version.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 4a2bfe3be..ec379936f 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -37,8 +37,8 @@ $(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX := $($(combo_2nd_arch_prefix)HOST_ ifneq (,$(strip $(wildcard $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-gcc))) $(combo_2nd_arch_prefix)HOST_CC := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-gcc $(combo_2nd_arch_prefix)HOST_CXX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-g++ -ifeq ($(mac_sdk_version),10.8) -# Mac SDK 10.8 no longer has stdarg.h, etc +ifneq ($(filter 10.8 10.9, $(mac_sdk_version)),) +# Mac SDK 10.8+ no longer has stdarg.h, etc host_toolchain_header := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_ROOT)/lib/gcc/i686-apple-darwin$(gcc_darwin_version)/4.2.1/include $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -isystem $(host_toolchain_header) endif diff --git a/core/combo/HOST_darwin-x86_64.mk b/core/combo/HOST_darwin-x86_64.mk index 0bc022779..a776a6997 100644 --- a/core/combo/HOST_darwin-x86_64.mk +++ b/core/combo/HOST_darwin-x86_64.mk @@ -37,8 +37,8 @@ HOST_TOOLCHAIN_PREFIX := $(HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwi ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)-gcc))) HOST_CC := $(HOST_TOOLCHAIN_PREFIX)-gcc HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)-g++ -ifeq ($(mac_sdk_version),10.8) -# Mac SDK 10.8 no longer has stdarg.h, etc +ifneq ($(filter 10.8 10.9, $(mac_sdk_version)),) +# Mac SDK 10.8+ no longer has stdarg.h, etc host_toolchain_header := $(HOST_TOOLCHAIN_ROOT)/lib/gcc/i686-apple-darwin$(gcc_darwin_version)/4.2.1/include HOST_GLOBAL_CFLAGS += -isystem $(host_toolchain_header) endif diff --git a/core/combo/mac_version.mk b/core/combo/mac_version.mk index b49feeefb..6defba79e 100644 --- a/core/combo/mac_version.mk +++ b/core/combo/mac_version.mk @@ -9,7 +9,7 @@ ifndef build_mac_version build_mac_version := $(shell sw_vers -productVersion) -mac_sdk_versions_supported := 10.6 10.7 10.8 +mac_sdk_versions_supported := 10.6 10.7 10.8 10.9 ifneq ($(strip $(MAC_SDK_VERSION)),) mac_sdk_version := $(MAC_SDK_VERSION) ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),) -- 2.11.0