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

Merge pull request #68998 from matthewbauer/gcc-8-darwin

Browse Source 
gcc: use gcc8 on darwin
This commit is contained in:
Matthew Bauer 2019-09-20 23:28:31 -04:00 committed by GitHub
commit 21961744c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/gcc/8/default.nix
View File

@ -373,9 +373,6 @@ stdenv.mkDerivation ({
stdenv.lib.platforms.freebsd ++ stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++ stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin; stdenv.lib.platforms.darwin;
# See #40038
broken = stdenv.isDarwin;
}; };
} }

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

@ -7506,7 +7506,7 @@ in
gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; };
gccFun = callPackage ../development/compilers/gcc/8; gccFun = callPackage ../development/compilers/gcc/8;
gcc = if stdenv.isDarwin then gcc7 else gcc8; gcc = gcc8;
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 {