From 18b27c94363f3f015a079422ddb1025cfdc1d56e Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Mon, 4 Apr 2016 11:55:03 -0600 Subject: [PATCH] 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. --- makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 24592fdc27..8f933a4d80 100755 --- a/makefile +++ b/makefile @@ -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)