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

stdenv: correct cross CMAKE_SYSTEM_NAME #65484

Merged
merged 1 commit into from Aug 14, 2019

Conversation

arcnmx
Copy link
Member

@arcnmx arcnmx commented Jul 27, 2019

Motivation for this change

As described in cmake cross instructions, CMAKE_SYSTEM_NAME should be set to "Generic" if there is no applicable OS. Otherwise it gets set to the build host's system name which can result in impure and unpredictable output.

I noticed this was unset while messing around with #65483 and cross-compiling compiler-rt, though it only affects bare-metal cross compiling and isn't really related or necessary to get compiler-rt working so split off into its own PR.

(I hope this usage of lib is okay? I couldn't figure out a nice way to do null coalescing...)

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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

As described in cmake cross instructions, CMAKE_SYSTEM_NAME should be
set to "Generic" if there is no applicable OS:

https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/CrossCompiling#setting-up-the-system-and-toolchain
@matthewbauer matthewbauer merged commit 166905c into NixOS:master Aug 14, 2019
@arcnmx arcnmx deleted the pr-stdenv-cmake-cross branch November 26, 2022 05:55
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

2 participants