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

Enable building riscv64 cross bootstrap tools

Browse Source 
Fixes #35089
This commit is contained in:
Shea Levy 2018-02-18 15:12:33 -05:00
parent a551e6debc
commit 0a0ecc4c2c
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View File

@ -17,4 +17,5 @@ in with (import ../../../lib).systems.examples; {
i686-musl = make musl32;
armv6l-musl = make muslpi;
aarch64-musl = make aarch64-multiplatform-musl;
riscv64 = make riscv64;
}

5
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -5,6 +5,7 @@
let
pkgs = import ../../.. { inherit localSystem crossSystem; };
libc = pkgs.stdenv.cc.libc;
isl = with pkgs; if targetPlatform.isRiscV then isl_0_17 else isl_0_14;
in with pkgs; rec {
@ -19,7 +20,7 @@ in with pkgs; rec {
tarMinimal = gnutar.override { acl = null; };
busyboxMinimal = busybox.override {
useMusl = true;
useMusl = !targetPlatform.isRiscV;
enableStatic = true;
enableMinimal = true;
extraConfig = ''
@ -143,7 +144,7 @@ in with pkgs; rec {
# These needed for cross but not native tools because the stdenv
# GCC has certain things built in statically. See
# pkgs/stdenv/linux/default.nix for the details.
cp -d ${isl_0_14.out}/lib/libisl*.so* $out/lib
cp -d ${isl.out}/lib/libisl*.so* $out/lib
'' + ''
cp -d ${bzip2.out}/lib/libbz2.so* $out/lib