diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 2465e6149c0a6..494f37c25e4fa 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -439,6 +439,9 @@ stdenv.mkDerivation ({ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ stdenv.lib.platforms.darwin; + + # See #40038 + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3aaeb5bad1162..5ef4a36181d98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6072,7 +6072,8 @@ with pkgs; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; 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; gccStdenv = if stdenv.cc.isGNU then stdenv else stdenv.override { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5233051cad835..efced59ad91b7 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -110,7 +110,10 @@ let jobs.tests.cc-wrapper-gcc7.x86_64-linux jobs.tests.cc-wrapper-gcc7.x86_64-darwin 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-darwin jobs.tests.cc-wrapper-libcxx.x86_64-linux