diff options
author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2016-07-07 16:00:17 -0700 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2016-10-31 09:08:27 +0000 |
commit | 89d55db226661552f2736694659f3affb32e55d2 (patch) | |
tree | f6f278f3fdca8968bfb88247b0e6f435b9aa8896 | |
parent | 8ea021503d2070e7951aec5f5a54badb03c63f63 (diff) |
configure and mkspecs: Don't try to find xcrun with xcrunwip/nacl
Since Xcode 8 (beta 2) that tool is no longer available
through xcrun. We resort to xcodebuild instead.
Change-Id: If9d7b535c1cbac2caae0112b2003283aeff34fb9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | mkspecs/features/mac/default_pre.prf | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -527,7 +527,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then exit 2 fi - if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then + if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then echo >&2 echo " Xcode not set up properly. You may need to confirm the license" >&2 echo " agreement by running /usr/bin/xcodebuild without arguments." >&2 diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf index 0cc8cd6dfd..5df99d1acd 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") # Make sure Xcode is set up properly - isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \ + isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") } |