remove cargo-xbuild, fix nix build #2408
Merged
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.
ARTIQ Pull Request
Description of Changes
After the misoc changes removing xbuild were merged, it broke nix build for kc705. That was a bit of a surprise, as it compiled fine within the development shell (where I have done for most of my tests), but okay, it is a different world.
#1787 mentions an issue where build-std is basically unsupported with Nix without awful 500+ line workarounds, which I thought is the issue at the beginning, but it turned out I just had to cave into cargo's demands for every extra package required to build core/alloc, one by one, specifying the version exactly (see bootloader/Cargo.toml).
One other thing that was broken was that the
llvm_asm
macro was replaced with a newasm
macro, so that feature also had to be added.Tested by
nix build .#artiq-board-kc705-nist_clock
and running HITL tests.Type of Changes
Steps (Choose relevant, delete irrelevant before submitting)
All Pull Requests
Code Changes
Git Logistics
git rebase --interactive
). Merge/squash/fixup commits that just fix or amend previous commits. Remove unintended changes & cleanup. See tutorial.git show
). Format:Licensing
See copyright & licensing for more info.
ARTIQ files that do not contain a license header are copyrighted by M-Labs Limited and are licensed under LGPLv3+.