Skip to content

Commit

Permalink
Merge pull request #26 from hcho3/stdlib-migration
Browse files Browse the repository at this point in the history
Migrate to `{{ stdlib("c") }}`
  • Loading branch information
jakirkham authored May 14, 2024
2 parents ee206c9 + 335b831 commit 719be0c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ c_compiler:
- vs2019
c_stdlib:
- vs
c_stdlib_version:
- '2019'
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 4 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ github:
provider:
linux_aarch64: default
linux_ppc64le: default
os_version:
linux_64: cos7
linux_aarch64: cos7
linux_ppc64le: cos7
18 changes: 9 additions & 9 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ source:
sha256: 6a1c32e68ee1a95ca17334691ff9ad1ffe7f352c24a083d55e4c96b8063b2bcb # [win]

build:
number: 1
number: 2
skip: true # [osx]

outputs:
Expand All @@ -40,7 +40,7 @@ outputs:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- arm-variant * {{ arm_variant_type }} # [aarch64]
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
- patchelf <0.18.0 # [linux]
host:
- cuda-version {{ cuda_version }}
Expand Down Expand Up @@ -77,7 +77,7 @@ outputs:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- arm-variant * {{ arm_variant_type }} # [aarch64]
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
host:
- cuda-version {{ cuda_version }}
- {{ pin_subpackage("cuda-cudart_" + target_platform, exact=True) }}
Expand Down Expand Up @@ -121,7 +121,7 @@ outputs:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- arm-variant * {{ arm_variant_type }} # [aarch64]
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
host:
- cuda-version {{ cuda_version }}
run:
Expand Down Expand Up @@ -163,7 +163,7 @@ outputs:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- arm-variant * {{ arm_variant_type }} # [aarch64]
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
host:
- cuda-version {{ cuda_version }}
run:
Expand Down Expand Up @@ -205,7 +205,7 @@ outputs:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- arm-variant * {{ arm_variant_type }} # [aarch64]
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
host:
- cuda-version {{ cuda_version }}
run:
Expand Down Expand Up @@ -239,7 +239,7 @@ outputs:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- arm-variant * {{ arm_variant_type }} # [aarch64]
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
host:
- cuda-version {{ cuda_version }}
run:
Expand Down Expand Up @@ -272,7 +272,7 @@ outputs:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- arm-variant * {{ arm_variant_type }} # [aarch64]
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
host:
- cuda-version {{ cuda_version }}
run:
Expand Down Expand Up @@ -305,7 +305,7 @@ outputs:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- arm-variant * {{ arm_variant_type }} # [aarch64]
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
host:
- cuda-version {{ cuda_version }}
run:
Expand Down

0 comments on commit 719be0c

Please sign in to comment.