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 new asm 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
Type
✓
:bug: Bug fix
Steps (Choose relevant, delete irrelevant before submitting)
All Pull Requests
[x] Use correct spelling and grammar.
Code Changes
[x] Test your changes or have someone test them. Mention what was tested and how.
[x] Add and check docstrings and comments
Git Logistics
[x] Split your contribution into logically separate changes (git rebase --interactive). Merge/squash/fixup commits that just fix or amend previous commits. Remove unintended changes & cleanup. See tutorial.
[x] Write short & meaningful commit messages. Review each commit for messages (git show). Format:
topic: description. < 50 characters total.
Longer description. < 70 characters per line
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+.
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_asmmacro was replaced with a newasmmacro, so that feature also had to be added.Tested by
nix build .#artiq-board-kc705-nist_clockand 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.[x] Write short & meaningful commit messages. Review each commit for messages (
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+.