Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gcc/{11,12}: update buildFlags for --disable-bootstrap case #217995

Merged
merged 2 commits into from Mar 8, 2023
Merged

gcc/{11,12}: update buildFlags for --disable-bootstrap case #217995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3547bc
gcc/{11,12}: update buildFlags for `--disable-bootstrap` case
Feb 23, 2023
8a05f77
https://github.com/NixOS/nixpkgs/pull/217995#pullrequestreview-131862…
Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/development/compilers/gcc/11/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
This conversation was marked as resolved.
Show resolved Hide resolved
lib.optionalString (profiledCompiler) "profiled" +
lib.optionalString (targetPlatform == hostPlatform && hostPlatform == buildPlatform && !disableBootstrap) "bootstrap";

inherit (callFile ../common/strip-attributes.nix { })
stripDebugList
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/gcc/12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,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
Expand Down