-
Notifications
You must be signed in to change notification settings - Fork 6
Add cross configuration #69
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
{ | ||
"rust-analyzer.cargo.features": [ | ||
"rt", | ||
"stm32h503" | ||
"stm32h503", | ||
"async", | ||
], | ||
"rust-analyzer.check.allTargets": false, | ||
"rust-analyzer.check.targets": "thumbv8m.main-none-eabihf", | ||
} | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# Cross doesn't seem to look for package specific configurations when invoked in a workspace so | ||
# we put the default target in Cross.toml | ||
|
||
# Allow usage of locally built version of the cross docker image that matches the host architecture | ||
# e.g. Building a linux/arm64 image for an AARCH64 host allows native execution of the image. | ||
# Specifying the toolchain for a linux/arm64 image means the correct toolchain is used on that | ||
# platform (it defaults to x86_64). | ||
[target.aarch64-unknown-linux-gnu.image] | ||
name = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main" | ||
toolchain = ["linux/arm64=aarch64-unknown-linux-gnu"] |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Judging by the
line in
Cross.toml
is there something special to do on that arch?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So you can run it on either architecture. That directive in
Cross.toml
is to allow you to run tests for theaarch64-unknown-linux-gnu
in a crossaarch64-unknown-linux-gnu
image that is built for arm64 hosts (ie. no cross-compilation), which makes building a lot faster on an arm64 Macs (and probably Windows too). Unfortunately building that cross image for arm64 hosts is currently broken (this PR will fix it I believe: https://github.com/japaric/xargo/pull/349/files), so including instructions for use is kinda awkward. Without that directive, cross will download theaarch64-unknown-linux-gnu
image built for x86_64 and run the tests on that, which does involve cross compilation and provides no benefit over running thex86_64-unknown-linux-gnu
cross image.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, okay
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll add some instructions for building with a guest image that matches the host architecture when it's more accessible with cross!