Commit a74147fe authored by Sergei Trofimovich's avatar Sergei Trofimovich
Browse files

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.
parent d96115b5
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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;
+0 −2
Original line number Diff line number Diff line
@@ -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