Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a2b9f0a authored by Naseer Ahmed's avatar Naseer Ahmed Committed by Ying Wang
Browse files

core: OSX: Support 10.9 SDK as well 

Change-Id: I764102df9b84ca19d217e35a209a9c80abeed6e7
parent 597bfe1e

core/combo/HOST_darwin-x86.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -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)))

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_CC  := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-gcc

$(combo_2nd_arch_prefix)HOST_CXX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-g++

$(combo_2nd_arch_prefix)HOST_CXX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)-g++

ifeq ($(mac_sdk_version),10.8)

ifneq ($(filter 10.8 10.9, $(mac_sdk_version)),)

# Mac SDK 10.8 no longer has stdarg.h, etc

# 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

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)

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -isystem $(host_toolchain_header)

endif

endif

core/combo/HOST_darwin-x86_64.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -37,8 +37,8 @@ HOST_TOOLCHAIN_PREFIX := $(HOST_TOOLCHAIN_ROOT)/bin/i686-apple-darwin$(gcc_darwi 
ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)-gcc)))

ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)-gcc)))

HOST_CC  := $(HOST_TOOLCHAIN_PREFIX)-gcc

HOST_CC  := $(HOST_TOOLCHAIN_PREFIX)-gcc

HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)-g++

HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)-g++

ifeq ($(mac_sdk_version),10.8)

ifneq ($(filter 10.8 10.9, $(mac_sdk_version)),)

# Mac SDK 10.8 no longer has stdarg.h, etc

# 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_toolchain_header := $(HOST_TOOLCHAIN_ROOT)/lib/gcc/i686-apple-darwin$(gcc_darwin_version)/4.2.1/include

HOST_GLOBAL_CFLAGS += -isystem $(host_toolchain_header)

HOST_GLOBAL_CFLAGS += -isystem $(host_toolchain_header)

endif

endif

core/combo/mac_version.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ ifndef build_mac_version 




build_mac_version := $(shell sw_vers -productVersion)

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)),)

ifneq ($(strip $(MAC_SDK_VERSION)),)

mac_sdk_version := $(MAC_SDK_VERSION)

mac_sdk_version := $(MAC_SDK_VERSION)

ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),)

ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),)