fix: rename gnu→gnu_omp variant and add stdlib(c) for Intel glibc#12
Closed
gunnar1987 wants to merge 1 commit into
Closed
fix: rename gnu→gnu_omp variant and add stdlib(c) for Intel glibc#12gunnar1987 wants to merge 1 commit into
gunnar1987 wants to merge 1 commit into
Conversation
- Rename 'gnu' variant to 'gnu_omp' to prevent build-string glob
overlap with 'gnu_mpi' (conda install "runner=*=gnu_*" matched both)
- Move stdlib('c') outside compiler conditional so Intel variant gets
proper sysroot linkage and __glibc run_export constraint
- Set c_stdlib_version=2.28 for Intel variant (Intel compilers require
sysroot>=2.28, incompatible with default 2.17)
Co-Authored-By: Oz <oz-agent@warp.dev>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes two reported build issues:
1. GNU/OMP variant resolves to MPI at install time
The
gnuvariant's build string (gnu_h…) is a prefix ofgnu_mpi_h…, soconda install "runner=*=gnu_*"matches both variants. Renamedgnu→gnu_ompto make the globs unambiguous.2. Intel variant linked to wrong glibc
${{ stdlib('c') }}was only in the GNU branch of the compiler conditional. The Intel build:__glibcconstraint in the metadataFix: moved
stdlib('c')outside the conditional and setc_stdlib_version=2.28for Intel (required byifx_linux-64).Changes
recipe/recipe.yaml— movedstdlib('c')before the compiler conditional; updated variant descriptionrecipe/conda_build_config.yaml—gnu→gnu_omp; added per-variantc_stdlib_versionwith zip_keys.ci_support/— updatedrunner_variantandc_stdlib_versionin affected configsVerification
All three Linux variants rebuilt and tested successfully with
rattler-build:__glibcgnu_omp_h6d0f835_1>=2.17gnu_mpi_h1733be7_1>=2.17intel_h6facef5_1>=2.28