You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

configure-xcoderun.patch 1.2KB

12345678910111213141516171819202122232425
  1. --- old/qtbase/configure
  2. +++ new/qtbase/configure
  3. @@ -543,7 +543,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
  4. exit 2
  5. fi
  6. - if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
  7. + if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
  8. echo >&2
  9. echo " Xcode not set up properly. You may need to confirm the license" >&2
  10. echo " agreement by running /usr/bin/xcodebuild without arguments." >&2
  11. diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
  12. index 0cc8cd6..5df99d1 100644
  13. --- old/qtbase/mkspecs/features/mac/default_pre.prf
  14. +++ new/qtbase/mkspecs/features/mac/default_pre.prf
  15. @@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
  16. error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
  17. # Make sure Xcode is set up properly
  18. - isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
  19. + isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
  20. error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
  21. }
  22. --