Merge #228606: gcc: fix fastStdenv breakage from #209870

2023-05-01 17:21:42 +02:00
parent 895f4255d5 cfc4c95770
commit 586616fd4b
1 changed files with 3 additions and 1 deletions
@@ -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;

@@ -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";