alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

build-support/rust: Add target option

Browse source
This commit is contained in:
exfalso 2019-10-24 11:39:08 +01:00
parent 1c40ee6fc4
commit a588b1dfbc
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/build-support/rust/default.nix
View file

@ -18,6 +18,7 @@
verifyCargoDeps ? false verifyCargoDeps ? false
, buildType ? "release" , buildType ? "release"
, meta ? {} , meta ? {}
, target ? null
, cargoVendorDir ? null , cargoVendorDir ? null
, ... } @ args: , ... } @ args:
@ -50,12 +51,13 @@ let
rustHostConfig = { rustHostConfig = {
x86_64-pc-mingw32 = "x86_64-pc-windows-gnu"; x86_64-pc-mingw32 = "x86_64-pc-windows-gnu";
}.${hostConfig} or hostConfig; }.${hostConfig} or hostConfig;
rustTarget = if target == null then rustHostConfig else target;
ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc";
cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
releaseDir = "target/${rustHostConfig}/${buildType}"; releaseDir = "target/${rustTarget}/${buildType}";
in in
stdenv.mkDerivation (args // { stdenv.mkDerivation (args // {
@ -88,7 +90,7 @@ stdenv.mkDerivation (args // {
[target."${stdenv.buildPlatform.config}"] [target."${stdenv.buildPlatform.config}"]
"linker" = "${ccForBuild}" "linker" = "${ccForBuild}"
${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) ''
[target."${rustHostConfig}"] [target."${rustTarget}"]
"linker" = "${ccForHost}" "linker" = "${ccForHost}"
${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633
stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) ''
@ -133,7 +135,7 @@ stdenv.mkDerivation (args // {
"CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \
cargo build \ cargo build \
${stdenv.lib.optionalString (buildType == "release") "--release"} \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \
--target ${rustHostConfig} \ --target ${rustTarget} \
--frozen ${concatStringsSep " " cargoBuildFlags} --frozen ${concatStringsSep " " cargoBuildFlags}
) )