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

Refactor nix configuration on ci and the aarch64 gcc dependency on x86_64 machines #89

Merged
merged 8 commits into from
Jul 29, 2024

Conversation

potsrevennil
Copy link
Contributor

@potsrevennil potsrevennil commented Jul 22, 2024

1. Utilization of pkgCross.aarch-multiplatform:

  • The pkgCross.aarch-multiplatform package in Nix is now used to set up GCC targeting the AArch64 platform. This change enhances clarity and simplicity.
  • The cumbersome arm-gnu-gcc.nix file can thus be removed.
  • Note: AArch64 macOS will continue using the native Clang compiler as per the original setup.

2. Cross Prefix Modification:

  • The cross prefix for GCC in pkgCross.aarch-multiplatform has changed from aarch64-none-linux-gnu- to aarch64-unknown-linux-gnu-.
  • To accommodate this, the test script has been updated to allow users to specify the cross prefix they are using.

3. CI Configuration Refactor:

  • The CI configuration has been streamlined by utilizing GitHub defaults for setting up the Nix shell, thereby avoiding multiple shell declarations.

@potsrevennil potsrevennil marked this pull request as ready for review July 22, 2024 09:58
@potsrevennil potsrevennil requested a review from a team July 22, 2024 09:58
cothan
cothan previously approved these changes Jul 22, 2024
@mkannwischer mkannwischer added the benchmark this PR should be benchmarked in CI label Jul 23, 2024
scripts/tests Outdated Show resolved Hide resolved
@mkannwischer
Copy link
Contributor

I tested that I can cross compile on x86 and the produced binaries still run on A55. Functionally this is looking good for me. If you fix the one comment I had, we can get this merged.
Thanks @potsrevennil!

@cothan cothan dismissed their stale review July 23, 2024 04:52

I can't test cross compilation since I only have aarch64 machines

@potsrevennil potsrevennil marked this pull request as draft July 23, 2024 06:01
@potsrevennil potsrevennil marked this pull request as ready for review July 23, 2024 06:30
@mkannwischer mkannwischer added benchmark this PR should be benchmarked in CI and removed benchmark this PR should be benchmarked in CI labels Jul 26, 2024
Copy link
Contributor

@mkannwischer mkannwischer left a comment

Choose a reason for hiding this comment

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

Thanks @potsrevennil! This is much cleaner now!

I tested that everything still works on my laptop (cross-compiled + qemu) and on my RPi (natively).

@mkannwischer mkannwischer merged commit bad1095 into pq-code-package:main Jul 29, 2024
9 checks passed
@potsrevennil potsrevennil deleted the nix-aarch64-gcc branch September 9, 2024 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
benchmark this PR should be benchmarked in CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants