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

rustc: build with gcc6 on i686 

Probably due to the bundled LLVM, so the same error.
This commit is contained in:
Vladimír Čunát 2018-02-19 21:26:54 +01:00
parent be8062d34b
commit fbe38c7c44
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/rust/default.nix
View File

@ -10,7 +10,7 @@ let
in in
rec { rec {
rustc = callPackage ./rustc.nix { rustc = callPackage ./rustc.nix {
inherit llvm targets targetPatches targetToolchains rustPlatform version; inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version;
forceBundledLLVM = true; forceBundledLLVM = true;
@ -34,6 +34,7 @@ rec {
srcSha = "14b2n1msxma19ydchj54hd7f2zdsr524fg133dkmdn7j65f1x6aj"; srcSha = "14b2n1msxma19ydchj54hd7f2zdsr524fg133dkmdn7j65f1x6aj";
cargoSha256 = "1sj59z0w172qvjwg1ma5fr5am9dgw27086xwdnrvlrk4hffcr7y7"; cargoSha256 = "1sj59z0w172qvjwg1ma5fr5am9dgw27086xwdnrvlrk4hffcr7y7";
inherit stdenv;
inherit rustc; # the rustc that will be wrapped by cargo inherit rustc; # the rustc that will be wrapped by cargo
inherit rustPlatform; # used to build cargo inherit rustPlatform; # used to build cargo
}; };

5
pkgs/top-level/all-packages.nix
View File

@ -6564,7 +6564,10 @@ with pkgs;
}; };
# For beta and nightly releases use the nixpkgs-mozilla overlay # For beta and nightly releases use the nixpkgs-mozilla overlay
rust = callPackage ../development/compilers/rust { }; rust = callPackage ../development/compilers/rust
(stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
});
inherit (rust) cargo rustc; inherit (rust) cargo rustc;
buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { }; buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { };