Ticket #52200: patch-no-xcrun.diff

File patch-no-xcrun.diff, 2.0 KB (added by raimue (Rainer Müller), 8 years ago)

  • configure 

    From 77a71c32c9d19b87f79b208929e71282e8d8b5d9 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Date: Thu, 7 Jul 2016 16:00:17 -0700
Subject: [PATCH] configure and mkspecs: Don't try to find xcrun with xcrun
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since Xcode 8 (beta 2) that tool is no longer available
through xcrun. We resort to xcodebuild instead.

Change-Id: If9d7b535c1cbac2caae0112b2003283aeff34fb9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 configure                            | 2 +-
 mkspecs/features/mac/default_pre.prf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git configure configure
index a1f0a8f..f4c7813 100755
    if [ "$BUILD_ON_MAC" = "yes" ]; then 
    543543        exit 2
    544544    fi
    545545
    546     if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
     546    if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
    547547        echo >&2
    548548        echo "   Xcode not set up properly. You may need to confirm the license" >&2
    549549        echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2

  • mkspecs/features/mac/default_pre.prf 

    diff --git mkspecs/features/mac/default_pre.prf mkspecs/features/mac/default_pre.prf
index 0cc8cd6..5df99d1 100644
    isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { 
    1212        error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
    1313
    1414    # Make sure Xcode is set up properly
    15     isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
     15    isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
    1616        error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
    1717}
    1818