contrib/bootstrap: improve xcrun handling

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 246e3d6b66edd47f6a9b891ba7fe2c86fc1d7088..24e5779e8753805340f5bd314821d8691b41fb47 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -171,7 +171,11 @@ check_ios_sdk()
 
 check_macosx_sdk()
 {
-   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.7" && OSX_VERSION=10.7
+   if [ -z "${OSX_VERSION}" ]
+   then
+      OSX_VERSION=`xcrun --show-sdk-version`
+      echo "OSX_VERSION not specified, assuming $OSX_VERSION"
+   fi
    if test -z "$SDKROOT"
    then
       SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
@@ -184,6 +188,12 @@ check_macosx_sdk()
       SDKROOT=`xcode-select -print-path`/SDKs/MacOSX$OSX_VERSION.sdk
       echo "SDKROOT not found at $SDKROOT_NOT_FOUND, trying $SDKROOT"
    fi
+   if [ ! -d "${SDKROOT}" ]
+   then
+      SDKROOT_NOT_FOUND="$SDKROOT"
+      SDKROOT=`xcrun --show-sdk-path`
+      echo "SDKROOT not found at $SDKROOT_NOT_FOUND, trying $SDKROOT"
+   fi
 
    if [ ! -d "${SDKROOT}" ]
    then