diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-18 15:12:33 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-18 16:07:13 -0500 |
| commit | 0a0ecc4c2c0c6b55a250f7c31e06fb090e307259 (patch) | |
| tree | 6b8cf83a8818e36caba8a5bc10a3cd4094a95109 /pkgs/stdenv/linux/make-bootstrap-tools.nix | |
| parent | a551e6debce4cfc0bac3a051f5256a523cd32459 (diff) | |
| download | nixpkgs-0a0ecc4c2c0c6b55a250f7c31e06fb090e307259.tar nixpkgs-0a0ecc4c2c0c6b55a250f7c31e06fb090e307259.tar.gz nixpkgs-0a0ecc4c2c0c6b55a250f7c31e06fb090e307259.tar.bz2 nixpkgs-0a0ecc4c2c0c6b55a250f7c31e06fb090e307259.tar.lz nixpkgs-0a0ecc4c2c0c6b55a250f7c31e06fb090e307259.tar.xz nixpkgs-0a0ecc4c2c0c6b55a250f7c31e06fb090e307259.tar.zst nixpkgs-0a0ecc4c2c0c6b55a250f7c31e06fb090e307259.zip | |
Enable building riscv64 cross bootstrap tools
Fixes #35089
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools.nix')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 86801e3f044..71347ef8392 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -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 |