diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-18 16:25:27 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-18 16:27:22 -0500 |
| commit | 32ce7012f0ec479be27c81ab7ce64dca66a2d9e3 (patch) | |
| tree | 0b69e0bd2d4aad0f3c37d4ba1ec2d67176e35df8 /pkgs/stdenv | |
| parent | ba5563b5bc8ef8514a53e73e58ca5b9fd07fdfdf (diff) | |
| parent | a96886863a0616f528b4cfe17faf182cb29d3a03 (diff) | |
Merge branch 'master' into gcc-7
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index d08be79e6c553..6c217be4ea3c7 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -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; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 86801e3f04475..8033d47d5db51 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -19,7 +19,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 +143,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_0_17.out}/lib/libisl*.so* $out/lib '' + '' cp -d ${bzip2.out}/lib/libbz2.so* $out/lib |