nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 10:50:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #224944 from amjoseph-nixpkgs/pr/fix-amjoseph-stupidity

Browse Source 
gcc: do not --disable-bootstrap, create libgcc output, or create checksum output on Darwin
This commit is contained in:
Artturi
2023-04-06 12:32:26 +03:00
committed by GitHub
parent 4253816bc7 1b771711b6
commit aae463d3dd
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/11/default.nix
View File

@@ -51,7 +51,7 @@ with builtins;
let majorVersion = "11";
version = "${majorVersion}.3.0";
disableBootstrap = true;
disableBootstrap = !stdenv.hostPlatform.isDarwin;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;

2
pkgs/development/compilers/gcc/12/default.nix
View File

@@ -56,7 +56,7 @@ with builtins;
let majorVersion = "12";
version = "${majorVersion}.2.0";
disableBootstrap = true;
disableBootstrap = !stdenv.hostPlatform.isDarwin;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;

2
pkgs/development/compilers/gcc/common/checksum.nix
View File

@@ -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" ];

2
pkgs/development/compilers/gcc/common/libgcc.nix
View File

@@ -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" ];