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

Merge pull request #106790 from lopsided98/rustc-host-std

Browse Source 
rustc: add host platform to --target when building cross-compiler
This commit is contained in:
John Ericson
2020-12-12 17:27:56 -05:00
committed by GitHub
parent 8f546be8e2 5a923e552c
commit c2c0d57339
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/rust/rustc.nix
View File

@@ -11,7 +11,7 @@
}:
let
inherit (stdenv.lib) optionals optional optionalString;
inherit (stdenv.lib) optionals optional optionalString concatStringsSep;
inherit (darwin.apple_sdk.frameworks) Security;
llvmSharedForBuild = pkgsBuildBuild.llvm_10.override { enableSharedLibraries = true; };
@@ -72,7 +72,14 @@ in stdenv.mkDerivation rec {
"--enable-vendor"
"--build=${rust.toRustTargetSpec stdenv.buildPlatform}"
"--host=${rust.toRustTargetSpec stdenv.hostPlatform}"
"--target=${rust.toRustTargetSpec stdenv.targetPlatform}"
# std is built for all platforms in --target. When building a cross-compiler
# we need to add the host platform as well so rustc can compile build.rs
# scripts.
"--target=${concatStringsSep "," ([
(rust.toRustTargetSpec stdenv.targetPlatform)
] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform) [
(rust.toRustTargetSpec stdenv.hostPlatform)
])}"
"${setBuild}.cc=${ccForBuild}"
"${setHost}.cc=${ccForHost}"