diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-02-22 22:25:58 -0800 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-02-23 23:22:19 -0800 |
| commit | c3547bc6ebce55124a5c9a53c81686efbdd7a957 (patch) | |
| tree | ffdbe64b6f4ef295999adbd9a9ef7b1fee79e972 /pkgs/development/compilers/gcc/11 | |
| parent | ac79516061d6fdcf8c32aafa8a3e48ac377ae33e (diff) | |
| download | nixpkgs-c3547bc6ebce55124a5c9a53c81686efbdd7a957.tar nixpkgs-c3547bc6ebce55124a5c9a53c81686efbdd7a957.tar.gz nixpkgs-c3547bc6ebce55124a5c9a53c81686efbdd7a957.tar.bz2 nixpkgs-c3547bc6ebce55124a5c9a53c81686efbdd7a957.tar.lz nixpkgs-c3547bc6ebce55124a5c9a53c81686efbdd7a957.tar.xz nixpkgs-c3547bc6ebce55124a5c9a53c81686efbdd7a957.tar.zst nixpkgs-c3547bc6ebce55124a5c9a53c81686efbdd7a957.zip | |
gcc/{11,12}: update buildFlags for `--disable-bootstrap` case
This commit updates the `buildFlags`, which is a single string with one of four possibilities: - "" - "profiled" - "bootstrap" - "profiledbootstrap" Previously only the last two were possible. Since 2ea34825020a74e5d62fb1a2fe819b165803ffd1 all four are possible.
Diffstat (limited to 'pkgs/development/compilers/gcc/11')
| -rw-r--r-- | pkgs/development/compilers/gcc/11/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 3919fbe89f3..2f6e986f3eb 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -249,9 +249,9 @@ stdenv.mkDerivation ({ targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; - buildFlags = optional - (targetPlatform == hostPlatform && hostPlatform == buildPlatform) - (if profiledCompiler then "profiledbootstrap" else "bootstrap"); + buildFlags = + lib.optionalString (profiledCompiler) "profiled" + + lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap"; inherit (callFile ../common/strip-attributes.nix { }) stripDebugList |