From 38f41a27b4eadf2eaf0e9913f266bc6a49a3cdaf Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 26 Apr 2023 00:02:00 -0700 Subject: [PATCH] stdenvBootstrapTools: drop no-longer-needed, now-broken cross clause The comment stating that "GCC has certain things built in statically" is no longer true as of https://github.com/NixOS/nixpkgs/pull/209870. Moreover, as pointed out in https://github.com/NixOS/nixpkgs/pull/228130 this optionalString block no longer builds for pkgsCross.*.freshBootstrapTools. It is safe to drop this clause now. --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 091130ebf93a..d6815093d457 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.