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

buildRustPackage: fix cargo flag for release/debug build #61521

Merged
merged 2 commits into from Jul 31, 2019

Conversation

adelbertc
Copy link
Contributor

@adelbertc adelbertc commented May 14, 2019

Motivation for this change

Previous behavior did not actually allow for "debug" build as it would
try to pass --debug to cargo, which is not a valid flag.

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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Previous behavior did not actually allow for "debug" build as it would
try to pass --debug to cargo, which is not a valid flag.
@c0bw3b
Copy link
Contributor

c0bw3b commented May 22, 2019

Related: #56540
cc @Mic92 @Ericson2314 @illegalprime for review

@adelbertc
Copy link
Contributor Author

Ping?

@@ -103,7 +105,7 @@ in stdenv.mkDerivation (args // {
"CC_${stdenv.hostPlatform.config}"="${ccForHost}" \
"CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \
cargo build \
--${buildType} \
${releaseFlag} \
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
${releaseFlag} \
${optionalString (buildType == "release") "--release"} \

Copy link
Member

Choose a reason for hiding this comment

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

Yeah that is better.

@Mic92 Mic92 merged commit 4403d44 into NixOS:master Jul 31, 2019
@adelbertc adelbertc deleted the fix-rust-release-flag branch July 31, 2019 16:11
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