diff options
| author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-04-27 03:58:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-27 03:58:30 +0000 |
| commit | bc024e10efdf5a41f94d4f82c053ce11abc137ae (patch) | |
| tree | 4992b9c4ca51588ce8f587f60ec6748ef9ca7e57 /pkgs/stdenv/linux | |
| parent | 8e3b64db39f2aaa14b35ee5376bd6a2e707cadc2 (diff) | |
| parent | 38f41a27b4eadf2eaf0e9913f266bc6a49a3cdaf (diff) | |
| download | nixpkgs-bc024e10efdf5a41f94d4f82c053ce11abc137ae.tar nixpkgs-bc024e10efdf5a41f94d4f82c053ce11abc137ae.tar.gz nixpkgs-bc024e10efdf5a41f94d4f82c053ce11abc137ae.tar.bz2 nixpkgs-bc024e10efdf5a41f94d4f82c053ce11abc137ae.tar.lz nixpkgs-bc024e10efdf5a41f94d4f82c053ce11abc137ae.tar.xz nixpkgs-bc024e10efdf5a41f94d4f82c053ce11abc137ae.tar.zst nixpkgs-bc024e10efdf5a41f94d4f82c053ce11abc137ae.zip | |
Merge pull request #228281 from amjoseph-nixpkgs/pr/bootstrapFiles/cross/fix
stdenvBootstrapTools: drop no-longer-needed, now-broken cross clause
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 091130ebf93..d6815093d45 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -158,12 +158,6 @@ in with pkgs; rec { cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib cp -d ${zlib.out}/lib/libz.so* $out/lib - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - # 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_20.out}/lib/libisl*.so* $out/lib - '' + lib.optionalString (stdenv.hostPlatform.isRiscV) '' # libatomic is required on RiscV platform for C/C++ atomics and pthread # even though they may be translated into native instructions. |