diff options
| author | Arnout Engelen <arnout@bzzt.net> | 2020-11-17 22:20:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 21:20:48 +0000 |
| commit | 05e0aa3040e4e94be4ee53dd22d754aaca9da133 (patch) | |
| tree | 0e8b4a439248137ef46cc3eadd3874751557527e /pkgs | |
| parent | e949d758998fafbef608adcf9f54d79a6e7da4c8 (diff) | |
| download | nixlib-05e0aa3040e4e94be4ee53dd22d754aaca9da133.tar nixlib-05e0aa3040e4e94be4ee53dd22d754aaca9da133.tar.gz nixlib-05e0aa3040e4e94be4ee53dd22d754aaca9da133.tar.bz2 nixlib-05e0aa3040e4e94be4ee53dd22d754aaca9da133.tar.lz nixlib-05e0aa3040e4e94be4ee53dd22d754aaca9da133.tar.xz nixlib-05e0aa3040e4e94be4ee53dd22d754aaca9da133.tar.zst nixlib-05e0aa3040e4e94be4ee53dd22d754aaca9da133.zip | |
gcc: update to isl 0.20.0 for bootstrapping and recent versions (#103311)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6c396b277469..6d6bca870bf9 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -274,9 +274,9 @@ in gmp = super.gmp.override { stdenv = self.makeStaticLibraries self.stdenv; }; mpfr = super.mpfr.override { stdenv = self.makeStaticLibraries self.stdenv; }; libmpc = super.libmpc.override { stdenv = self.makeStaticLibraries self.stdenv; }; - isl_0_17 = super.isl_0_17.override { stdenv = self.makeStaticLibraries self.stdenv; }; + isl_0_20 = super.isl_0_20.override { stdenv = self.makeStaticLibraries self.stdenv; }; gcc-unwrapped = super.gcc-unwrapped.override { - isl = isl_0_17; + isl = isl_0_20; }; }; extraNativeBuildInputs = [ prevStage.patchelf ] ++ diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index ec5f1092a469..421bb8502a4c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -152,7 +152,7 @@ in with pkgs; rec { # 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_17.out}/lib/libisl*.so* $out/lib + cp -d ${isl_0_20.out}/lib/libisl*.so* $out/lib '' + '' cp -d ${bzip2.out}/lib/libbz2.so* $out/lib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc6d4868f62a..56dc881d0137 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8934,7 +8934,7 @@ in inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); - isl = if !stdenv.isDarwin then isl_0_17 else null; + isl = if !stdenv.isDarwin then isl_0_20 else null; # just for stage static crossStageStatic = true; @@ -9027,7 +9027,7 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; - isl = if !stdenv.isDarwin then isl_0_17 else null; + isl = if !stdenv.isDarwin then isl_0_20 else null; })); gcc10 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/10 { @@ -9041,7 +9041,7 @@ in libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; - isl = if !stdenv.isDarwin then isl_0_17 else null; + isl = if !stdenv.isDarwin then isl_0_20 else null; })); gcc_latest = gcc10; |