Skip to content

Reinstate libcxx version that matches compiler #134

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

Merged
github-actions merged 3 commits into from
Aug 7, 2024
Merged

Reinstate libcxx version that matches compiler #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5032de
Reinstate libcxx version that matches compiler
h-vetinari Jul 10, 2024
9d0ff9b
Revert "reverse channel order"
h-vetinari Jul 30, 2024
ee426c3
bump build number
h-vetinari Jul 30, 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
2 changes: 1 addition & 1 deletion recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ channel_sources:
- conda-forge
- conda-forge
- conda-forge
- conda-forge,conda-forge/label/llvm_rc
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge main
- conda-forge main
Expand Down
11 changes: 4 additions & 7 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
{% set version = "18.1.8" %}
{% endif %}
{% set major_ver = version.split(".")[0] %}
# first version requiring `__osx >=10.13`; libcxx 18 still in progress
{% if major_ver|int >= 17 %}
{% set libcxx_major = 17 %}
{% else %}
{% set libcxx_major = 16 %}
{% endif %}
# in the past we've had to uncouple the compiler version from the version
# of the C++ stdlib; keep the variable in case this happens again
{% set libcxx_major = major_ver %}

{% set build_number = 18 %}
{% set build_number = 19 %}

# pretend this variable is used, so that smithy populates the variant configs
# [meson_release_flag]
Expand Down