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

buildRustPackage: add support for parallel build

Browse Source
This commit is contained in:
Mario Rodas 2020-08-16 10:00:00 -05:00
parent d4d9ad66a0
commit b52808f1ad
No known key found for this signature in database
GPG Key ID: 325649BCA6D53027
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/rust/default.nix
View File

@ -181,7 +181,7 @@ stdenv.mkDerivation (args // {
"CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \
"CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \
"CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \
cargo build \ cargo build -j $NIX_BUILD_CORES \
${stdenv.lib.optionalString (buildType == "release") "--release"} \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \
--target ${rustTarget} \ --target ${rustTarget} \
--frozen ${concatStringsSep " " cargoBuildFlags} --frozen ${concatStringsSep " " cargoBuildFlags}
@ -208,7 +208,7 @@ stdenv.mkDerivation (args // {
${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"}
runHook preCheck runHook preCheck
echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=$NIX_BUILD_CORES ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
runHook postCheck runHook postCheck
${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"}
''); '');