MacOSX11.0.sdk support

automerged PR by conda-forge/automerge-action
conda-forge · Aug 5, 2020 · a3549f6 · a3549f6
2 parents 4fa0b40 + 80f9dc5
commit a3549f6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/recipe/download_osx_sdk.sh b/recipe/download_osx_sdk.sh
@@ -16,6 +16,21 @@ else
     export MACOSX_SDK_VERSION=$MACOSX_DEPLOYMENT_TARGET
 fi
 
+if [[ "$MACOSX_SDK_VERSION" == "11.0" ]]; then
+    if [[ "$(uname)" != "Darwin" ]]; then
+        echo "Can't cross compile to 11.0 from Linux yet as the SDK can't be downloaded."
+        exit 1
+    fi
+    if [[ "$CI" == "travis" ]]; then
+        export OSX_SDK_DIR=/Applications/Xcode-12.for.macOS.Universal.Apps.beta.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
+    elif [[ "$CI" == "azure" ]]; then
+        export OSX_SDK_DIR=/Applications/Xcode_12_beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
+    else
+        echo "Can't compile for 11.0 as the SDK location is unknown"
+        exit 1
+    fi
+fi
+
 export CONDA_BUILD_SYSROOT="${OSX_SDK_DIR}/MacOSX${MACOSX_SDK_VERSION}.sdk"
 
 if [[ ! -d ${CONDA_BUILD_SYSROOT} || "$OSX_FORCE_SDK_DOWNLOAD" == "1" ]]; then

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "conda-forge-ci-setup" %}
-{% set version = "3.1.7" %}
+{% set version = "3.1.8" %}
 
 package:
   name: {{ name|lower }}

diff --git a/recipe/run_conda_forge_build_setup_osx b/recipe/run_conda_forge_build_setup_osx
@@ -27,9 +27,11 @@ CI_SUPPORT=$PWD/.ci_support
 source ${SCRIPT_DIR}/cross_compile_support.sh
 source ${SCRIPT_DIR}/download_osx_sdk.sh
 
-# set minimum sdk version to our target
-plutil -replace MinimumSDKVersion -string ${MACOSX_SDK_VERSION} $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
-plutil -replace DTSDKName -string macosx${MACOSX_SDK_VERSION}internal $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
+if [[ "$MACOSX_DEPLOYMENT_TARGET" == 10.* ]]; then
+  # set minimum sdk version to our target
+  plutil -replace MinimumSDKVersion -string ${MACOSX_SDK_VERSION} $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
+  plutil -replace DTSDKName -string macosx${MACOSX_SDK_VERSION}internal $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist
+fi
 
 if [ ! -z "$CONFIG" ]; then
     if [ ! -z "$CI" ]; then