public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57936 from andir/build-rust-crate-nix-build-cores

Browse Source 
buildRustCrate: use $NIX_BUILD_CORES for each of the crates
This commit is contained in:
Andreas Rammhold 2019-03-29 12:29:43 +01:00 committed by GitHub
commit e0b4356c0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/rust/build-rust-crate/build-crate.nix
View File

@ -11,7 +11,7 @@
rustcOpts = rustcOpts =
lib.lists.foldl' (opts: opt: opts + " " + opt) lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2") (if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=1"] ++ extraRustcOpts); (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}";
# Some platforms have different names for rustc. # Some platforms have different names for rustc.

2
pkgs/build-support/rust/build-rust-crate/configure-crate.nix
View File

@ -22,7 +22,7 @@ let version_ = lib.splitString "-" crateVersion;
version = lib.splitString "." (lib.head version_); version = lib.splitString "." (lib.head version_);
rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt) rustcOpts = lib.lists.foldl' (opts: opt: opts + " " + opt)
(if release then "-C opt-level=3" else "-C debuginfo=2") (if release then "-C opt-level=3" else "-C debuginfo=2")
(["-C codegen-units=1"] ++ extraRustcOpts); (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts);
buildDeps = makeDeps buildDependencies; buildDeps = makeDeps buildDependencies;
authors = lib.concatStringsSep ":" crateAuthors; authors = lib.concatStringsSep ":" crateAuthors;
optLevel = if release then 3 else 0; optLevel = if release then 3 else 0;