mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-23 05:14:45 +00:00
gcc: do not --disable-bootstrap, create libgcc output, or create checksum output on Darwin
This commit is contained in:
parent
be07e18261
commit
1b771711b6
@ -51,7 +51,7 @@ with builtins;
|
||||
|
||||
let majorVersion = "11";
|
||||
version = "${majorVersion}.3.0";
|
||||
disableBootstrap = true;
|
||||
disableBootstrap = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
|
@ -56,7 +56,7 @@ with builtins;
|
||||
|
||||
let majorVersion = "12";
|
||||
version = "${majorVersion}.2.0";
|
||||
disableBootstrap = true;
|
||||
disableBootstrap = !stdenv.hostPlatform.isDarwin;
|
||||
|
||||
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
enableChecksum = (with stdenv; buildPlatform == hostPlatform && hostPlatform == targetPlatform) && langC && langCC;
|
||||
enableChecksum = (with stdenv; buildPlatform == hostPlatform && hostPlatform == targetPlatform) && langC && langCC && !stdenv.hostPlatform.isDarwin;
|
||||
in
|
||||
(pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs enableChecksum {
|
||||
outputs = previousAttrs.outputs ++ lib.optionals enableChecksum [ "checksum" ];
|
||||
|
@ -6,7 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
enableLibGccOutput = (with stdenv; targetPlatform == hostPlatform) && !langJit;
|
||||
enableLibGccOutput = (with stdenv; targetPlatform == hostPlatform) && !langJit && !stdenv.hostPlatform.isDarwin;
|
||||
in
|
||||
(pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {
|
||||
outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
|
||||
|
Loading…
Reference in New Issue
Block a user