Merge pull request #228281 from amjoseph-nixpkgs/pr/bootstrapFiles/cross/fix

stdenvBootstrapTools: drop no-longer-needed, now-broken cross clause
This commit is contained in:
Adam Joseph 2023-04-27 03:58:30 +00:00 committed by GitHub
commit bc024e10ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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.