Skip to content

Commit

Permalink
https://github.com/NixOS/nixpkgs/pull/217995#pullrequestreview-131862…
Browse files Browse the repository at this point in the history 
…0540
  • Loading branch information
Adam Joseph committed Mar 7, 2023
1 parent c3547bc commit 8a05f77
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions pkgs/development/compilers/gcc/11/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,10 @@ stdenv.mkDerivation ({
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

buildFlags =
lib.optionalString (profiledCompiler) "profiled" +
lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap";
let target =
lib.optionalString (profiledCompiler) "profiled" +
lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap";
in lib.optional (target != "") target;

inherit (callFile ../common/strip-attributes.nix { })
stripDebugList
Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/compilers/gcc/12/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,10 @@ stdenv.mkDerivation ({
targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

buildFlags =
lib.optionalString (profiledCompiler) "profiled" +
lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap";
let target =
lib.optionalString (profiledCompiler) "profiled" +
lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap";
in lib.optional (target != "") target;

inherit (callFile ../common/strip-attributes.nix { })
stripDebugList
Expand Down

0 comments on commit 8a05f77

Please sign in to comment.