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

lib: Allow parsing platform configs with arch of {riscv,wasm}{32,64} #34269

Merged
merged 1 commit into from Jan 26, 2018

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Jan 25, 2018

Also add isRiscv and isWasm predicates.

Motivation for this change

We want to compile to more platforms! This is the first step.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

CC @ElvishJerricco @boomshroom

i686 = { cpu = cpuTypes.i686; };
x86_64 = { cpu = cpuTypes.x86_64; };
PowerPC = { cpu = cpuTypes.powerpc; };
x86 = { cpu = { family = "x86"; }; };
Arm = { cpu = { family = "arm"; }; };
Aarch64 = { cpu = { family = "aarch64"; }; };
Mips = { cpu = { family = "mips"; }; };
Riscv = { cpu = { family = "riscv"; }; };
Copy link
Member Author

Choose a reason for hiding this comment

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

Or do we do RiscV? Bikeshed! 😁

Copy link
Contributor

Choose a reason for hiding this comment

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

The official style seems to be "RISC-V" -- if that doesn't fit the mold, I suppose "RiscV" at least captures the separation of the "RISC" and "V", so "RiscV" seems like a decent compromise and might be better than "Riscv".

With that said, I'm not adamant about it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Convinced!

@ElvishJerricco
Copy link
Contributor

Oh pretty ;)

@Ericson2314 Ericson2314 added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Jan 26, 2018
@Ericson2314 Ericson2314 merged commit 14725b9 into NixOS:master Jan 26, 2018
@Ericson2314 Ericson2314 deleted the lib-riscv-wasm branch January 26, 2018 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants