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:
commit
bc024e10ef
|
@ -158,12 +158,6 @@ in with pkgs; rec {
|
||||||
cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
|
cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
|
||||||
cp -d ${zlib.out}/lib/libz.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) ''
|
'' + lib.optionalString (stdenv.hostPlatform.isRiscV) ''
|
||||||
# libatomic is required on RiscV platform for C/C++ atomics and pthread
|
# libatomic is required on RiscV platform for C/C++ atomics and pthread
|
||||||
# even though they may be translated into native instructions.
|
# even though they may be translated into native instructions.
|
||||||
|
|
Loading…
Reference in a new issue