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

Compare commits

base: M-Labs:aa1c3726f3a0eaaf63cc7decc4556ce71a090dcc
Branches Tags
M-Labs:master
M-Labs:core_lib
..
compare: M-Labs:b17ec6fb1f4ac9758266fae8b3e0d5786d4e53be
Branches Tags
M-Labs:core_lib
M-Labs:master

No commits in common. "aa1c3726f3a0eaaf63cc7decc4556ce71a090dcc" and "b17ec6fb1f4ac9758266fae8b3e0d5786d4e53be" have entirely different histories.
aa1c3726f3 ... b17ec6fb1f

2 changed files with 4 additions and 8 deletions
Show Stats Expand all files Collapse all files

8
derivations.nix
View File

@ -18,15 +18,11 @@ rec {
binutils-riscv = pkgs.callPackage ./compilers/binutils.nix { platform = "riscv32"; };
llvm_7 = pkgs.llvm_7.overrideAttrs(oa: {
name = oa.name + "-riscv";
cmakeFlags = oa.cmakeFlags ++ ["-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=RISCV"];
cmakeFlags = oa.cmakeFlags ++ ["-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=RISCV" "-DLLVM_TARGETS_TO_BUILD=X86"];
});
lld_7 = (pkgs.lld_7.overrideAttrs(oa: {
name = oa.name + "-riscv";
})).override {
llvm = llvm_7;
};
rustc = (pkgs.rustc.overrideAttrs(oa: {
name = "${oa.pname}-${oa.version}-riscv";
configureFlags = oa.configureFlags ++ [ "--enable-lld" ];
})).override {
inherit llvm_7;
pkgsBuildBuild = pkgs.pkgsBuildBuild // { inherit llvm_7; };

4
shell-firmware.nix
View File

@ -3,6 +3,6 @@ let
hx = import ./derivations.nix { inherit pkgs; };
in
pkgs.mkShell {
buildInputs = [ hx.rustc hx.rust-riscv32imc-crates hx.lld_7 hx.cargo ];
RUSTFLAGS="-L ${hx.rust-riscv32imc-crates}/lib/rustlib/riscv32imc-unknown-none-elf/lib -C linker=lld";
buildInputs = [ hx.rustc hx.rust-riscv32imc-crates hx.cargo ];
RUSTFLAGS="-L ${hx.rust-riscv32imc-crates}/lib/rustlib/riscv32imc-unknown-none-elf/lib";
}