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

Merge pull request #40519 from Synthetica9/gcc8-darwin-revert

Browse Source 
gcc,gcc8: {revert gcc to gcc7, mark gcc8 as broken} on Darwin
This commit is contained in:
Matthew Justin Bauer 2018-05-15 10:01:49 -05:00 committed by GitHub
commit da5a692fcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 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

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

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

@ -6072,7 +6072,8 @@ with pkgs;
gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { };
gccFun = callPackage ../development/compilers/gcc/7; gccFun = callPackage ../development/compilers/gcc/7;
gcc = gcc8; # Temporary solution until #40038 is fixed
gcc = if stdenv.isDarwin then gcc7 else 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 {

5
pkgs/top-level/release.nix
View File

@ -110,7 +110,10 @@ let
jobs.tests.cc-wrapper-gcc7.x86_64-linux jobs.tests.cc-wrapper-gcc7.x86_64-linux
jobs.tests.cc-wrapper-gcc7.x86_64-darwin jobs.tests.cc-wrapper-gcc7.x86_64-darwin
jobs.tests.cc-wrapper-gcc8.x86_64-linux jobs.tests.cc-wrapper-gcc8.x86_64-linux
jobs.tests.cc-wrapper-gcc8.x86_64-darwin
# broken see issue #40038
# jobs.tests.cc-wrapper-gcc8.x86_64-darwin
jobs.tests.cc-wrapper-clang.x86_64-linux jobs.tests.cc-wrapper-clang.x86_64-linux
jobs.tests.cc-wrapper-clang.x86_64-darwin jobs.tests.cc-wrapper-clang.x86_64-darwin
jobs.tests.cc-wrapper-libcxx.x86_64-linux jobs.tests.cc-wrapper-libcxx.x86_64-linux