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

strace: check machine personalities for all non-x86 architectures #45472

Merged
merged 1 commit into from Aug 23, 2018

Conversation

CrystalGamma
Copy link
Contributor

This allows strace to be built for ppc64le as well.
Part of my roadmap to bring NixOS to OpenPower platforms.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

This allows strace to be built for ppc64le as well.
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {

buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k

configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";
configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isi686) "--enable-mpers=check";
Copy link
Member

Choose a reason for hiding this comment

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

Looks good!. But you can actually do stdenv.hostPlatform.isx86 I believe (which covers both of these.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I just noticed :D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants