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

Commit 8df3355f authored by Ying Wang's avatar Ying Wang Committed by Andre Furtado
Browse files

Update mac_sdk_versions_supported. 

Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))

Bug: 22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538
parent eb651e2e

core/combo/mac_version.mk

+2 −2
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 10.9

mac_sdk_versions_supported :=  10.8 10.9 10.10

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)),)
@@ -19,7 +19,7 @@ $(warning ****************************************************************) 
$(error Stop.)

$(error Stop.)

endif

endif

else

else

mac_sdk_versions_installed := $(shell xcodebuild -showsdks | grep macosx | sort | sed -e "s/.*macosx//g")

mac_sdk_versions_installed := $(shell xcodebuild -showsdks | grep macosx | sed -e "s/.*macosx//g")

mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed), $(mac_sdk_versions_supported)))

mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed), $(mac_sdk_versions_supported)))

ifeq ($(mac_sdk_version),)

ifeq ($(mac_sdk_version),)

mac_sdk_version := $(firstword $(mac_sdk_versions_supported))

mac_sdk_version := $(firstword $(mac_sdk_versions_supported))