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

remove cargo-xbuild, fix nix build #2408

Merged
merged 1 commit into from
May 16, 2024

Conversation

Spaqin
Copy link
Collaborator

@Spaqin Spaqin commented May 16, 2024

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 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 fix

Steps (Choose relevant, delete irrelevant before submitting)

All Pull Requests

  • Use correct spelling and grammar.

Code Changes

  • Test your changes or have someone test them. Mention what was tested and how.
  • Add and check docstrings and comments

Git Logistics

  • 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.
  • 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+.

@sbourdeauducq sbourdeauducq merged commit c33c1df into m-labs:master May 16, 2024
@Spaqin Spaqin deleted the asm_getopts_fix branch June 5, 2024 04:13
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.

2 participants