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

Switch "native" check from being x86_64 only to checking HOST #369

Merged
merged 2 commits into from
Dec 29, 2021

Conversation

TDHolmes
Copy link
Contributor

If HOST==TARGET, we know we're compiling natively. Set a new rustc cfg for this and use it where we previously checked for x86_64.

I was trying to run tests on my M1 MacBook Pro and couldn't since it isn't x86_64. Also, the currently configured nightly compiler for asm doesn't have M1 support, so I updated that. I'm fine reverting that change though, I can just do that locally, but I'm sure others will hit the same issue and it's a bit old...

@TDHolmes TDHolmes requested a review from a team as a code owner December 15, 2021 19:41
@TDHolmes
Copy link
Contributor Author

🏷️ @japaric since it looks like rust-highfive doesn't like this PR and you modified this area of the build script previously

@TDHolmes
Copy link
Contributor Author

TDHolmes commented Dec 17, 2021

Failing CI until #372 merges

If `HOST==TARGET`, we know we're compiling natively. Set a new `rustc`
cfg for this and use it where we previously checked for `x86_64`.
@TDHolmes TDHolmes force-pushed the native-compilation-for-tests branch from 404d4a5 to dcc53bf Compare December 19, 2021 20:14
@TDHolmes
Copy link
Contributor Author

rebased on top of the asm PR to fix CI

@TDHolmes
Copy link
Contributor Author

This is pretty straight forward and enables ARM computers to run the CI

Copy link
Member

@adamgreig adamgreig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks!

bors merge

@bors
Copy link
Contributor

bors bot commented Dec 29, 2021

Build succeeded:

@bors bors bot merged commit f6c0312 into rust-embedded:master Dec 29, 2021
adamgreig pushed a commit that referenced this pull request Dec 31, 2021
Merge #369

Verified

This commit was signed with the committer’s verified signature.
adamgreig Adam Greig
369: Switch "native" check from being x86_64 only to checking `HOST` r=adamgreig a=TDHolmes

If `HOST==TARGET`, we know we're compiling natively. Set a new `rustc` cfg for this and use it where we previously checked for `x86_64`.

I was trying to run tests on my M1 MacBook Pro and couldn't since it isn't `x86_64`. Also, the currently configured nightly compiler for asm doesn't have M1 support, so I updated that. I'm fine reverting that change though, I can just do that locally, but I'm sure others will hit the same issue and it's a bit old...

Co-authored-by: Tyler Holmes <tyler@holmesengineering.com>
@adamgreig adamgreig mentioned this pull request Dec 31, 2021
@TDHolmes TDHolmes deleted the native-compilation-for-tests branch January 2, 2022 00:36
bors bot added a commit that referenced this pull request Jan 2, 2022
Merge #375

Partially verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
375: Prepare v0.7.4 r=thejpster a=adamgreig

I've created a new branch, `v0.7.x`, which is currently at the latest non-breaking commit (so includes #346 #349 #347 #351 #339 #352 #348 #363 #362 #361 but does not include #342), to track the 0.7 series since master now contains breaking changes for v0.8.

This PR (which targets the new branch) cherry-picks #372 #369 #374 and bumps the version to v0.7.4 (and updates CHANGELOG) ready for a new v0.7.4 release. Once complete I'll also backport the changelog entries and bump the version in master to 0.7.4.

I think this is everything that should be in 0.7 -- the only excluded PRs from master are #342 and #367 I believe, and I don't think we have any open PRs targeting 0.7 either.

Any other thoughts on items for inclusion in 0.7.4 (or other changelog entries I missed)?

Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: Adam Greig <adam@adamgreig.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants