JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc: update to isl 0.20.0 for bootstrapping and recent versions (#103311)

Browse Source
This commit is contained in:
Arnout Engelen 2020-11-17 22:20:48 +01:00 committed by GitHub
parent e949d75899
commit 05e0aa3040
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/linux/default.nix
View File

@ -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 ] ++

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -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

6
pkgs/top-level/all-packages.nix
View File

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