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

Compare commits

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

3 Commits
b17ec6fb1f ... aa1c3726f3

Author SHA1 Message Date
Sebastien Bourdeauducq aa1c3726f3 attempt to use lld linker 2019-06-05 23:46:29 +08:00
Sebastien Bourdeauducq d5c288c20b rustc: disable lld 2019-06-05 23:42:39 +08:00
Sebastien Bourdeauducq 1361c6ae9e Revert "llvm: only build x86 and riscv" 
This reverts commit b17ec6fb1f.
 2019-06-05 23:41:22 +08:00
2 changed files with 8 additions and 4 deletions
Show Stats Expand all files Collapse all files

8
derivations.nix
View File

@ -18,11 +18,15 @@ rec {
binutils-riscv = pkgs.callPackage ./compilers/binutils.nix { platform = "riscv32"; }; binutils-riscv = pkgs.callPackage ./compilers/binutils.nix { platform = "riscv32"; };
llvm_7 = pkgs.llvm_7.overrideAttrs(oa: { llvm_7 = pkgs.llvm_7.overrideAttrs(oa: {
name = oa.name + "-riscv"; name = oa.name + "-riscv";
cmakeFlags = oa.cmakeFlags ++ ["-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=RISCV" "-DLLVM_TARGETS_TO_BUILD=X86"]; cmakeFlags = oa.cmakeFlags ++ ["-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=RISCV"];
}); });
lld_7 = (pkgs.lld_7.overrideAttrs(oa: {
name = oa.name + "-riscv";
})).override {
llvm = llvm_7;
};
rustc = (pkgs.rustc.overrideAttrs(oa: { rustc = (pkgs.rustc.overrideAttrs(oa: {
name = "${oa.pname}-${oa.version}-riscv"; name = "${oa.pname}-${oa.version}-riscv";
configureFlags = oa.configureFlags ++ [ "--enable-lld" ];
})).override { })).override {
inherit llvm_7; inherit llvm_7;
pkgsBuildBuild = pkgs.pkgsBuildBuild // { 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; }; hx = import ./derivations.nix { inherit pkgs; };
in in
pkgs.mkShell { pkgs.mkShell {
buildInputs = [ hx.rustc hx.rust-riscv32imc-crates hx.cargo ]; 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"; RUSTFLAGS="-L ${hx.rust-riscv32imc-crates}/lib/rustlib/riscv32imc-unknown-none-elf/lib -C linker=lld";
} }