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.

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

When building for linux, replace all vendors with 'unknown' #922

Merged
merged 1 commit into from
Nov 17, 2022

Conversation

kanavin
Copy link

@kanavin kanavin commented Nov 1, 2022

Some build systems such as the Yocto project define custom rust targets, of the form 'arch-somevendor-linux-{gnu|musl}' (only the 'somevendor' part is custom, the rest matches rust's definitions).

This causes mismatches with crossbeam's lists of targets which are built from the standard rust target list, and always have 'unknown' as the vendor.

This change simply replaces such custom vendors with 'unknown' when the third component of the target is 'linux'.


Note from Alex: this is a reworked and hopefully better/more precise/acceptable version of #751

Some build systems such as the Yocto project define custom
rust targets, of the form 'arch-somevendor-linux-gnu/musl'
(only the 'somevendor' part is custom, the rest matches rust's
definitions).

This causes mismatches with crossbeam's lists of targets
which are built from the standard rust target list, and
always have 'unknown' as the vendor.

This change simply replaces such custom vendors with 'unknown' when
the third component of the target is 'linux'.
@taiki-e
Copy link
Member

taiki-e commented Nov 10, 2022

Thanks! This looks good to me.

@taiki-e
Copy link
Member

taiki-e commented Nov 17, 2022

bors r+

@bors
Copy link
Contributor

bors bot commented Nov 17, 2022

@bors bors bot merged commit 0a14e12 into crossbeam-rs:master Nov 17, 2022
bors bot added a commit that referenced this pull request Nov 20, 2022
929: v0.8: Prepare for the next release r=taiki-e a=taiki-e

Backports #922 and #926.

Changes:
- crossbeam-utils 0.8.12 -> 0.8.13
  - Update `memoffset` to 0.7. (#926)
  - Improve support for custom targets. (#922)
- crossbeam-queue 0.3.6 -> 0.3.7
  - Improve support for custom targets. (#922)
- crossbeam-epoch 0.9.11 -> 0.9.12
  - Improve support for custom targets. (#922)

Closes #928

Co-authored-by: Taiki Endo <[email protected]>
Co-authored-by: Alexander Kanavin <[email protected]>
Co-authored-by: Griffin Smith <[email protected]>
bors bot added a commit that referenced this pull request Nov 20, 2022
929: v0.8: Prepare for the next release r=taiki-e a=taiki-e

Backports #922 and #926.

Changes:
- crossbeam-utils 0.8.12 -> 0.8.13
  - Update `memoffset` to 0.7. (#926)
  - Improve support for custom targets. (#922)
- crossbeam-queue 0.3.6 -> 0.3.7
  - Improve support for custom targets. (#922)
- crossbeam-epoch 0.9.11 -> 0.9.12
  - Improve support for custom targets. (#922)

Closes #928

Co-authored-by: Taiki Endo <[email protected]>
Co-authored-by: Alexander Kanavin <[email protected]>
Co-authored-by: Griffin Smith <[email protected]>
@taiki-e
Copy link
Member

taiki-e commented Nov 20, 2022

Published in crossbeam-utils 0.8.13, crossbeam-queue 0.3.7, and crossbeam-epoch 0.9.12.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants