Skip to content

Commit

Permalink
Merge pull request #228281 from amjoseph-nixpkgs/pr/bootstrapFiles/cr…
Browse files Browse the repository at this point in the history
…oss/fix

stdenvBootstrapTools: drop no-longer-needed, now-broken cross clause
  • Loading branch information
Adam Joseph authored Apr 27, 2023
2 parents 8e3b64d + 38f41a2 commit bc024e1
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions pkgs/stdenv/linux/make-bootstrap-tools.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit bc024e1

Please sign in to comment.