Ticket #52310: patch-no-xcrun-f-xcrun.diff

File patch-no-xcrun-f-xcrun.diff, 1.2 KB (added by mkae (Marko Käning), 8 years ago)

Ran into the same issue, René's patch avoids the issue caused by xcrun

  • qtbase/configure

    diff --git a/qtbase/configure b/qtbase/configure
    index 4ce83be..de80807 100755
    a b 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
  • qtbase/mkspecs/features/mac/default_pre.prf

    diff --git a/qtbase/mkspecs/features/mac/default_pre.prf b/qtbase/mkspecs/features/mac/default_pre.prf
    index 0cc8cd6..5df99d1 100644
    a b 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