Unverified Commit 4758cfe9 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

stdenv/linux: disable and drop `isl` from gcc's bootstrap tools (#336985)

parents f31d4151 a74147fe

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

+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;

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

+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