From 1d0207e6116e36f98df8bf988a74706ba2ddef58 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Thu, 18 Jul 2019 17:45:40 +0200 Subject: [PATCH] [Dependencies] Do not check for Xcode 9.4 on Catalina. (#6605) --- system-dependencies.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/system-dependencies.sh b/system-dependencies.sh index f4e3536d65..bda19ee28f 100755 --- a/system-dependencies.sh +++ b/system-dependencies.sh @@ -521,7 +521,11 @@ function check_xcode () { # must have latest Xcode in /Applications/Xcode.app check_specific_xcode install_coresimulator - check_specific_xcode "94" + # Xcode 9,4 does not longer start on catalina + local current_os=$(sw_vers -productVersion) + if test $current_os != "10.15"; then + check_specific_xcode "94" + fi local XCODE_DEVELOPER_ROOT=`grep ^XCODE_DEVELOPER_ROOT= Make.config | sed 's/.*=//'` local IOS_SDK_VERSION=`grep ^IOS_SDK_VERSION= Make.config | sed 's/.*=//'`