diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-05-01 16:55:02 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-05-01 17:21:42 +0200 |
commit | 586616fd4b0f0694690e760bf352278fc80a426f (patch) | |
tree | ae2e377b5a2ecfd61ecfd33d8757c8b8d11c13dd | |
parent | 895f4255d513f7e73adde15bc0ebeb5fa78580d2 (diff) | |
parent | cfc4c957706ec37c67ed6800148fab6c72f1367d (diff) | |
download | nixlib-586616fd4b0f0694690e760bf352278fc80a426f.tar nixlib-586616fd4b0f0694690e760bf352278fc80a426f.tar.gz nixlib-586616fd4b0f0694690e760bf352278fc80a426f.tar.bz2 nixlib-586616fd4b0f0694690e760bf352278fc80a426f.tar.lz nixlib-586616fd4b0f0694690e760bf352278fc80a426f.tar.xz nixlib-586616fd4b0f0694690e760bf352278fc80a426f.tar.zst nixlib-586616fd4b0f0694690e760bf352278fc80a426f.zip |
Merge #228606: gcc: fix fastStdenv breakage from #209870
-rw-r--r-- | pkgs/development/compilers/gcc/12/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index a3e8faaed460..483ac2024402 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -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"; |