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

More helpful diagnostics when selecting a Mac SDK.

Browse Source 
Bug: 26398801
Change-Id: I95235ac153f352b24123a6931563d2a2f952b95e
This commit is contained in:
Dan Sandler
2016-01-05 11:28:09 -05:00
parent 84d7513417
commit 23faa1196e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/combo/mac_version.mk
View File

@@ -23,6 +23,7 @@ mac_sdk_versions_installed := $(shell xcodebuild -showsdks | grep macosx | sed -
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))
$(warning none of the installed SDKs ($mac_sdk_versions_installed) match supported versions ($(mac_sdk_versions_supported)), trying $(mac_sdk_version))
endif endif
endif endif
@@ -32,6 +33,7 @@ mac_sdk_path := $(shell xcode-select -print-path)
mac_sdk_root := $(mac_sdk_path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(mac_sdk_version).sdk mac_sdk_root := $(mac_sdk_path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(mac_sdk_version).sdk
ifeq ($(wildcard $(mac_sdk_root)),) ifeq ($(wildcard $(mac_sdk_root)),)
# try legacy /Developer/SDKs/MacOSX10.?.sdk # try legacy /Developer/SDKs/MacOSX10.?.sdk
$(warning no SDK $(mac_sdk_version) at $(mac_sdk_root), trying legacy dir)
mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk
endif endif
ifeq ($(wildcard $(mac_sdk_root)),) ifeq ($(wildcard $(mac_sdk_root)),)