Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/llvmdev_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion buildscripts/github/MacOSX10.10.sdk.checksum

This file was deleted.

1 change: 1 addition & 0 deletions buildscripts/github/MacOSX10.15.sdk.checksum
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2408d07df7f324d3beea818585a6d990ba99587c218a3969f924dfcc4de93b62 MacOSX10.15.sdk.tar.xz
8 changes: 4 additions & 4 deletions buildscripts/github/setup_platform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
*)
Expand Down
5 changes: 4 additions & 1 deletion conda-recipes/llvmdev/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
5 changes: 4 additions & 1 deletion conda-recipes/llvmdev_for_wheel/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
3 changes: 2 additions & 1 deletion conda-recipes/llvmlite/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion conda-recipes/llvmlite/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Loading