Ticket #59316: patch-build.d_lib_xcode_sh.diff

File patch-build.d_lib_xcode_sh.diff, 838 bytes (added by ballapete (Peter "Pete" Dyballa), 4 years ago)

Diff output to patch build.d/lib/xcode.sh to work on Catalina, macOS 10.15.6

  • build.d/lib/xcode.sh

    old new  
    9090
    9191        for sdk_name in `DEVELOPER_DIR="${xcode_path}" xcodebuild -showsdks 2>&4 | /usr/bin/sed -E -n -e 's/.*-sdk (macosx.*)/\1/p'`
    9292        do
    93             sdk_version="`DEVELOPER_DIR="${xcode_path}" xcodebuild -version -sdk ${sdk_name} SDKVersion 2>&4`"
     93            if [ "$xcode_version" == "12.0" ] ; then
     94                sdk_version="`DEVELOPER_DIR="${xcode_path}" xcodebuild -version -sdk ${sdk_name} SDKVersion 2>&4 | cut -d'.' -f1-2`"
     95            else
     96                sdk_version="`DEVELOPER_DIR="${xcode_path}" xcodebuild -version -sdk ${sdk_name} SDKVersion 2>&4`"
     97            fi
    9498            if ! version_is_version "${sdk_version}"
    9599            then
    96100                continue