MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use gcc 7 for RISC-V support.

Browse source
This commit is contained in:
Shea Levy 2018-02-18 00:11:28 -05:00
parent e288febee0
commit 3bec781288
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/top-level/all-packages.nix
View file

@ -5784,8 +5784,12 @@ with pkgs;
gambit = callPackage ../development/compilers/gambit { }; gambit = callPackage ../development/compilers/gambit { };
gerbil = callPackage ../development/compilers/gerbil { }; gerbil = callPackage ../development/compilers/gerbil { };
gccFun = callPackage ../development/compilers/gcc/6; # !!! When updating to gcc7 everywhere we can get rid of the
gcc = gcc6; # isRiscV overrides here and in gccCrossStageStatic
gccFun6 = callPackage ../development/compilers/gcc/6;
gccFun7 = callPackage ../development/compilers/gcc/7;
gccFun = if targetPlatform.isRiscV then gccFun7 else gccFun6;
gcc = if targetPlatform.isRiscV then gcc7 else gcc6;
gcc-unwrapped = gcc.cc; gcc-unwrapped = gcc.cc;
gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override {
@ -5865,6 +5869,7 @@ with pkgs;
bintools = binutils-unwrapped; bintools = binutils-unwrapped;
libc = libcCross1; libc = libcCross1;
}; };
isl = if targetPlatform.isRiscV then isl_0_17 else isl_0_14;
in wrapCCWith { in wrapCCWith {
name = "gcc-cross-wrapper"; name = "gcc-cross-wrapper";
cc = gccFun { cc = gccFun {
@ -5872,7 +5877,7 @@ with pkgs;
inherit noSysDirs; inherit noSysDirs;
# PGO seems to speed up compilation by gcc by ~10%, see #445 discussion # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
isl = if !stdenv.isDarwin then isl_0_14 else null; isl = if !stdenv.isDarwin then isl else null;
# just for stage static # just for stage static
crossStageStatic = true; crossStageStatic = true;