Skip to content

Commit

Permalink
don't remove m2w64_ prefix in stdlib piggyback
Browse files Browse the repository at this point in the history
  • Loading branch information
h-vetinari committed May 7, 2024
1 parent 3e086ea commit 1e9844e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions conda_forge_tick/migrators/cstdlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ def _process_section(output_index, attrs, lines):
if line_compiler_c and line_compiler_m2c:
# we have both compiler("c") and compiler("m2w64_c"), likely with complementary
# selectors; add a second stdlib line after m2w64_c with respective selector
selector_m2c = " " * 8 + selector_m2c if selector_m2c else ""
to_insert = indent + '- {{ stdlib("c") }}' + selector_m2c + "\n"
selector_m2c = " " + selector_m2c if selector_m2c else ""
to_insert = indent + '- {{ stdlib("m2w64_c") }}' + selector_m2c + "\n"
line_insert = line_compiler_m2c + 1 + (line_compiler_c < line_compiler_m2c)
lines = lines[:line_insert] + [to_insert] + lines[line_insert:]

Expand Down
2 changes: 1 addition & 1 deletion tests/test_yaml/stdlib_go_after_meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ outputs:
- {{ compiler('fortran') }} # [unix and cgo]

- {{ compiler('m2w64_c') }} # [win and cgo]
- {{ stdlib("c") }} # [win and cgo]
- {{ stdlib("m2w64_c") }} # [win and cgo]
- {{ compiler('m2w64_cxx') }} # [win and cgo]
- {{ compiler('m2w64_fortran') }} # [win and cgo]
run:
Expand Down

0 comments on commit 1e9844e

Please sign in to comment.