Skip to content

Commit

Permalink
Merge #228606: gcc: fix fastStdenv breakage from #209870
Browse files Browse the repository at this point in the history
  • Loading branch information
vcunat committed May 1, 2023
2 parents 895f425 + cfc4c95 commit 586616f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkgs/development/compilers/gcc/12/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ with builtins;

let majorVersion = "12";
version = "${majorVersion}.2.0";
disableBootstrap = !stdenv.hostPlatform.isDarwin;
disableBootstrap = !stdenv.hostPlatform.isDarwin && !profiledCompiler;

inherit (stdenv) buildPlatform hostPlatform targetPlatform;

Expand Down Expand Up @@ -288,6 +288,8 @@ lib.pipe (stdenv.mkDerivation ({
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

buildFlags =
# we do not yet have Nix-driven profiling
assert profiledCompiler -> !disableBootstrap;
let target =
lib.optionalString (profiledCompiler) "profiled" +
lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap";
Expand Down

0 comments on commit 586616f

Please sign in to comment.