update to iOS 9.2 SDK and define sysroot for iOS

Previously, we only seemed to define sysroot for MacOS, not iOS, yet
we reference $(sysroot) in both cases.  This ensures it is defined in
both cases as well.
This commit is contained in:
Joel Dice 2016-04-04 11:55:03 -06:00
parent c299319b16
commit 18b27c9436

View File

@ -799,7 +799,8 @@ ifeq ($(kernel),darwin)
sdk-dir = $(platform-dir)/Developer/SDKs
ios-version := $(shell \
if test -L $(sdk-dir)/$(target)9.1.sdk; then echo 9.1; \
if test -L $(sdk-dir)/$(target)9.2.sdk; then echo 9.2; \
elif test -L $(sdk-dir)/$(target)9.1.sdk; then echo 9.1; \
elif test -L $(sdk-dir)/$(target)9.0.sdk; then echo 9.0; \
elif test -d $(sdk-dir)/$(target)8.3.sdk; then echo 8.3; \
elif test -d $(sdk-dir)/$(target)8.2.sdk; then echo 8.2; \
@ -816,9 +817,11 @@ ifeq ($(kernel),darwin)
else echo; fi)
ifeq ($(ios-version),)
x := $(error "couldn't find SDK")
x := $(error "couldn't find SDK in $(sdk-dir)")
endif
sysroot = $(sdk-dir)/$(target)$(ios-version).sdk
ios-bin = $(platform-dir)/Developer/usr/bin
found-gcc = $(shell if test -f $(ios-bin)/gcc; then echo true; else echo false; fi)