Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG fix zipping for c stdlib #5592

Merged
merged 5 commits into from
Mar 5, 2024
Merged

BUG fix zipping for c stdlib #5592

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4d030d
dummy commit for rerendering
conda-forge-webservices[bot] Mar 5, 2024
24081b1
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
Mar 5, 2024
64365cb
BUG try this for stdlib stuff
beckermr Mar 5, 2024
542d221
Update conda_build_config.yaml
beckermr Mar 5, 2024
a273eb3
Update recipe/conda_build_config.yaml
beckermr Mar 5, 2024
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
11 changes: 5 additions & 6 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ c_stdlib:
- macosx_deployment_target # [osx]
- vs # [win]
c_stdlib_version: # [unix]
- 2.12 # [linux64]
- 2.17 # [aarch64 or ppc64le]
- 2.12 # [linux and x86_64]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also for CUDA this needs to be 2.17 (even on x86_64)

- 2.17 # [linux and not x86_64]
- 10.9 # [osx and x86_64]
- 11.0 # [osx and arm64]
cxx_compiler:
Expand Down Expand Up @@ -161,16 +161,15 @@ zip_keys:
- c_compiler_version # [unix]
- cxx_compiler_version # [unix]
- fortran_compiler_version # [unix]
- c_stdlib # [unix]
- c_stdlib_version # [unix]
- cdt_name # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cuda_compiler # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cuda_compiler_version # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cdt_name # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- docker_image # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM", "").startswith("linux-")]
- # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cuda_compiler # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cuda_compiler_version # [win64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- # [unix]
- c_stdlib # [unix]
- c_stdlib_version # [unix]
-
- python
- numpy
Expand Down