diff --git a/.github/workflows/llvmdev_build.yml b/.github/workflows/llvmdev_build.yml index 1cb5a9253..1d5b1a2b4 100644 --- a/.github/workflows/llvmdev_build.yml +++ b/.github/workflows/llvmdev_build.yml @@ -141,11 +141,7 @@ jobs: run: | set -x mkdir -p "${CONDA_CHANNEL_DIR}" - EXTRA_ARGS=() - if [[ "${{ matrix.platform }}" == "osx-64" ]]; then - EXTRA_ARGS=(--variants '{"CONDA_BUILD_SYSROOT": "/opt/MacOSX10.10.sdk"}') - fi - conda build "./conda-recipes/${{ matrix.recipe }}" "--output-folder=${CONDA_CHANNEL_DIR}" "${EXTRA_ARGS[@]}" + conda build "./conda-recipes/${{ matrix.recipe }}" "--output-folder=${CONDA_CHANNEL_DIR}" ls -lah "${CONDA_CHANNEL_DIR}" - name: Upload conda package diff --git a/buildscripts/github/MacOSX10.10.sdk.checksum b/buildscripts/github/MacOSX10.10.sdk.checksum deleted file mode 100644 index a4fdcba00..000000000 --- a/buildscripts/github/MacOSX10.10.sdk.checksum +++ /dev/null @@ -1 +0,0 @@ -3839b875df1f2bc98893b8502da456cc0b022c4666bc6b7eb5764a5f915a9b00 MacOSX10.10.sdk.tar.xz diff --git a/buildscripts/github/MacOSX10.15.sdk.checksum b/buildscripts/github/MacOSX10.15.sdk.checksum new file mode 100644 index 000000000..608e3269a --- /dev/null +++ b/buildscripts/github/MacOSX10.15.sdk.checksum @@ -0,0 +1 @@ +2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62 MacOSX10.15.sdk.tar.xz diff --git a/buildscripts/github/setup_platform.sh b/buildscripts/github/setup_platform.sh index ec49863ef..dbaacfcab 100644 --- a/buildscripts/github/setup_platform.sh +++ b/buildscripts/github/setup_platform.sh @@ -13,17 +13,17 @@ case "${PLATFORM}" in mkdir -p "${sdk_dir}" # Download SDK - echo "Downloading MacOSX10.10.sdk.tar.xz" - wget -q https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.10.sdk.tar.xz + echo "Downloading MacOSX10.15.sdk.tar.xz" + wget -q https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz # Verify checksum echo "Verifying SDK checksum" - shasum -c "${sdk_dir}/MacOSX10.10.sdk.checksum" || exit 1 + shasum -c "${sdk_dir}/MacOSX10.15.sdk.checksum" || exit 1 # Extract SDK to /opt echo "Extracting SDK to /opt" sudo mkdir -p /opt - sudo tar -xf MacOSX10.10.sdk.tar.xz -C /opt + sudo tar -xf MacOSX10.15.sdk.tar.xz -C /opt echo "macOS SDK setup complete" ;; *) diff --git a/conda-recipes/llvmdev/conda_build_config.yaml b/conda-recipes/llvmdev/conda_build_config.yaml index 4680c58b7..888a6576e 100644 --- a/conda-recipes/llvmdev/conda_build_config.yaml +++ b/conda-recipes/llvmdev/conda_build_config.yaml @@ -16,4 +16,7 @@ cxx_compiler: # [win] - vs2022 # [win] MACOSX_SDK_VERSION: # [osx and x86_64] - - 10.12 # [osx and x86_64] + - 10.15 # [osx and x86_64] + +CONDA_BUILD_SYSROOT: + - /opt/MacOSX10.15.sdk # [osx and x86_64] diff --git a/conda-recipes/llvmdev_for_wheel/conda_build_config.yaml b/conda-recipes/llvmdev_for_wheel/conda_build_config.yaml index 6709f378f..c99670624 100644 --- a/conda-recipes/llvmdev_for_wheel/conda_build_config.yaml +++ b/conda-recipes/llvmdev_for_wheel/conda_build_config.yaml @@ -23,4 +23,7 @@ cxx_compiler_version: # [osx] - 14 # [osx] MACOSX_SDK_VERSION: # [osx and x86_64] - - 10.12 # [osx and x86_64] + - 10.15 # [osx and x86_64] + +CONDA_BUILD_SYSROOT: + - /opt/MacOSX10.15.sdk # [osx and x86_64] diff --git a/conda-recipes/llvmlite/build.sh b/conda-recipes/llvmlite/build.sh index 66aa2f43f..251462a71 100755 --- a/conda-recipes/llvmlite/build.sh +++ b/conda-recipes/llvmlite/build.sh @@ -7,7 +7,8 @@ if [ -n "$MACOSX_DEPLOYMENT_TARGET" ]; then if [[ $build_platform == osx-arm64 ]]; then export MACOSX_DEPLOYMENT_TARGET=11.1 else - export MACOSX_DEPLOYMENT_TARGET=10.12 + # OSX needs 10.15 or above for consistency with wheel builds + export MACOSX_DEPLOYMENT_TARGET=10.15 fi fi diff --git a/conda-recipes/llvmlite/conda_build_config.yaml b/conda-recipes/llvmlite/conda_build_config.yaml index 27b70ec92..888a6576e 100644 --- a/conda-recipes/llvmlite/conda_build_config.yaml +++ b/conda-recipes/llvmlite/conda_build_config.yaml @@ -15,5 +15,8 @@ c_compiler: # [win] cxx_compiler: # [win] - vs2022 # [win] +MACOSX_SDK_VERSION: # [osx and x86_64] + - 10.15 # [osx and x86_64] + CONDA_BUILD_SYSROOT: - - /opt/MacOSX10.10.sdk # [osx and x86_64] + - /opt/MacOSX10.15.sdk # [osx and x86_64]