Unverified Commit bc024e10 authored by Adam Joseph's avatar Adam Joseph Committed by GitHub
Browse files

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

stdenvBootstrapTools: drop no-longer-needed, now-broken cross clause
parents 8e3b64db 38f41a27

pkgs/stdenv/linux/make-bootstrap-tools.nix

+0 −6
Original line number Diff line number Diff line
@@ -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.