[vlc-commits] contrib/bootstrap: improve xcrun handling

[Luca Barbato]

vlc | branch: master | Luca Barbato <lu_zero at gentoo.org> | Wed Mar  5 11:30:08 2014 +0100| [e31fb2a4d1f7271d670700aeb925e658bcabf05f] | committer: Felix Paul Kühne

contrib/bootstrap: improve xcrun handling

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e31fb2a4d1f7271d670700aeb925e658bcabf05f
---

 contrib/bootstrap |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 246e3d6..24e5779 100755
--- 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