M-Labs
/
HeavyX
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: M-Labs:e9b005d50ac4ce3b938fcc12e527e6505910b573
Branches Tags
M-Labs:master
M-Labs:core_lib
...
compare: M-Labs:9e93a9cf39edf23936127baeebe050e11e83fd86
Branches Tags
M-Labs:core_lib
M-Labs:master

2 Commits
e9b005d50a ... 9e93a9cf39

Author SHA1 Message Date
Sebastien Bourdeauducq 9e93a9cf39 rustc: make llvm override compatible with nixos-unstable 2019-05-14 19:17:16 +08:00
Sebastien Bourdeauducq 9f4538555e fix previous commit 2019-05-14 19:16:52 +08:00
1 changed files with 7 additions and 2 deletions
Show Stats Expand all files Collapse all files

9
derivations.nix
View File

@ -21,8 +21,13 @@ rec {
cmakeFlags = oa.cmakeFlags ++ ["-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=RISCV"]; cmakeFlags = oa.cmakeFlags ++ ["-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=RISCV"];
}); });
rustc = (pkgs.rustc.overrideAttrs(oa: { rustc = (pkgs.rustc.overrideAttrs(oa: {
name = oa.name + "-riscv"; name = "${oa.pname}-${oa.version}-riscv";
patches = oa.patches ++ [ ./compilers/rustc-riscv32i.patch ]; patches = oa.patches ++ [ ./compilers/rustc-riscv32i.patch ];
})).override { inherit llvm_7; }; })).override {
inherit llvm_7;
pkgsBuildBuild = pkgs.pkgsBuildBuild // { inherit llvm_7; };
pkgsBuildHost = pkgs.pkgsBuildHost // { inherit llvm_7; };
pkgsBuildTarget = pkgs.pkgsBuildTarget // { inherit llvm_7; };
};
rust-riscv32i-crates = pkgs.callPackage ./compilers/rust-riscv32i-crates.nix { inherit rustc; }; rust-riscv32i-crates = pkgs.callPackage ./compilers/rust-riscv32i-crates.nix { inherit rustc; };
} }