Skip to content

gcc: do not --disable-bootstrap, create libgcc output, or create checksum output on Darwin#224944

Merged
Artturin merged 1 commit intostaging-nextfrom
unknown repository
Apr 6, 2023
Merged

gcc: do not --disable-bootstrap, create libgcc output, or create checksum output on Darwin#224944
Artturin merged 1 commit intostaging-nextfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 6, 2023

I broke gcc on Darwin.

This fixes it.

@ghost ghost requested a review from matthewbauer as a code owner April 6, 2023 04:43
@ghost ghost mentioned this pull request Apr 6, 2023
4 tasks
@ghost
Copy link
Copy Markdown
Author

ghost commented Apr 6, 2023

# before 209870
$ git reset --hard 867440983fa5c542a677e30cee581e5f37531052
HEAD is now at 867440983fa5 Merge staging-next into staging
$ nix-instantiate . -A gcc --argstr localSystem aarch64-darwin
/nix/store/hvxzhiy871sq7jsiq3qhywzp37sga0r4-gcc-wrapper-12.2.0.drv

# after 209870 plus 224944
$ git fetch https://github.com/NixOS/nixpkgs/ pull/209870/head; git reset --hard FETCH_HEAD
From https://github.com/NixOS/nixpkgs
 * branch                      refs/pull/209870/head -> FETCH_HEAD
HEAD is now at 6c209e862e18 emacs: path fixes resulting from libgccjit changes
$ git fetch https://github.com/NixOS/nixpkgs/ pull/224944/head
From https://github.com/NixOS/nixpkgs
 * branch                      refs/pull/224944/head -> FETCH_HEAD
$ git cherry-pick FETCH_HEAD
Auto-merging pkgs/development/compilers/gcc/11/default.nix
[pr/fix-amjoseph-stupidity 8465718e1212] gcc: do not --disable-bootstrap, create libgcc output, or create checksum output on Darwin
 Date: Wed Apr 5 21:31:17 2023 -0700
 4 files changed, 4 insertions(+), 4 deletions(-)
$ nix-instantiate . -A gcc --argstr localSystem aarch64-darwin
/nix/store/hvxzhiy871sq7jsiq3qhywzp37sga0r4-gcc-wrapper-12.2.0.drv

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Apr 6, 2023
@ofborg ofborg bot requested review from Ericson2314, Synthetica9 and vcunat April 6, 2023 05:28
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Apr 6, 2023
@ghost ghost requested review from K900, tpwrules and trofi and removed request for vcunat April 6, 2023 06:20
@Artturin Artturin merged commit aae463d into NixOS:staging-next Apr 6, 2023
@ghost ghost deleted the pr/fix-amjoseph-stupidity branch April 6, 2023 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants