Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[osx/ios] fix the configure script to retrieve correct xcode path if xcode not in default location #2121

Merged
merged 1 commit into from

2 participants

@ulion
Collaborator

fix the configure script to retrieve correct xcode path if xcode not installed in the default location

@davilla davilla merged commit 6a85317 into xbmc:master
@ulion ulion deleted the ulion:xcodepath_fix branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 26, 2013
  1. @ulion

    fix the configure script to retrieve correct xcode path if xcode not …

    ulion authored
    …installed
    
    in the default location.
This page is out of date. Refresh to see the latest.
Showing with 12 additions and 6 deletions.
  1. +12 −6 tools/darwin/depends/configure.in
View
18 tools/darwin/depends/configure.in
@@ -19,12 +19,18 @@ AC_ARG_WITH([sdk],
use_staging="/Users/Shared/xbmc-depends"
-# find xcodebuild, test in Xcode.app, if not there, fall back to normal location
-use_xcodepath="/Applications/Xcode.app/Contents/Developer"
-use_xcodebuild="/Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild"
-if [[ ! -f "$use_xcodebuild" ]]; then
- use_xcodepath="/Developer"
- use_xcodebuild="/usr/bin/xcodebuild"
+# find xcodebuild and xcodepath by xcode-select
+# else test in Xcode.app, if not there, fall back to normal location
+if [[ -f "/usr/bin/xcode-select" ]]; then
+ use_xcodepath=`/usr/bin/xcode-select -print-path`
+ use_xcodebuild="$use_xcodepath/usr/bin/xcodebuild"
+else
+ use_xcodepath="/Applications/Xcode.app/Contents/Developer"
+ use_xcodebuild="/Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild"
+ if [[ ! -f "$use_xcodebuild" ]]; then
+ use_xcodepath="/Developer"
+ use_xcodebuild="/usr/bin/xcodebuild"
+ fi
fi
AC_MSG_RESULT(found xcodebuild at $use_xcodebuild)
use_xcode=[`$use_xcodebuild -version | grep Xcode | awk '{ print $2}'`]
Something went wrong with that request. Please try again.