From a74147fe6a895b7c87c2fe0efaec905c7b50c991 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 24 Aug 2024 10:21:59 +0100
Subject: [PATCH] stdenv/linux: disable and drop `isl` from gcc's bootstrap
 tools

`isl` is only needed to support `gcc` transformations enabled by
`-fgraphite*` options. Packages do not usually use those flags. None of
the bootstrap packages use it.

`nixpkgs` does not use up-to-date `isl` for `gcc` either. Let's drop
`isl` dependency from the bootstrap binary seed.
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix   | 5 ++++-
 pkgs/stdenv/linux/stdenv-bootstrap-tools.nix | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 77834e55f66a..61c44f0bfecb 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -44,7 +44,10 @@ rec {
     '';
   };
 
-  bootGCC = pkgs.gcc.cc.override { enableLTO = false; };
+  bootGCC = pkgs.gcc.cc.override {
+    enableLTO = false;
+    isl = null;
+  };
 
   bootBinutils = pkgs.binutils.bintools.override {
     withAllTargets = false;
diff --git a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
index 894c70389267..0bc472489c5f 100644
--- a/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/stdenv-bootstrap-tools.nix
@@ -17,7 +17,6 @@
   gnumake,
   gnused,
   gzip,
-  isl,
   libc,
   libmpc,
   mpfr,
@@ -156,7 +155,6 @@ stdenv.mkDerivation (finalAttrs: {
       rm -rf $out/include/c++/*/ext/parallel
 
       cp -d ${gmpxx.out}/lib/libgmp*.so* $out/lib
-      cp -d ${isl.out}/lib/libisl*.so* $out/lib
       cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
       cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
       cp -d ${zlib.out}/lib/libz.so* $out/lib