Skip to content

gcc: move dll to output#251828

Merged
Artturin merged 2 commits intoNixOS:stagingfrom
Artturin:gccfixes1
Aug 28, 2023
Merged

gcc: move dll to output#251828
Artturin merged 2 commits intoNixOS:stagingfrom
Artturin:gccfixes1

Conversation

@Artturin
Copy link
Member

@Artturin Artturin commented Aug 27, 2023

Non python non hook changes from #227818

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@Artturin Artturin added the 6.topic: windows Running, or buiding, packages on Windows label Aug 27, 2023
@Artturin Artturin requested a review from matthewbauer as a code owner August 27, 2023 18:47
@Artturin Artturin requested a review from a user August 27, 2023 18:47
@Artturin Artturin requested a review from Ericson2314 as a code owner August 27, 2023 18:47
@Artturin Artturin changed the base branch from master to staging August 27, 2023 18:52
@Artturin Artturin force-pushed the gccfixes1 branch 2 times, most recently from 19556d2 to 35c36a3 Compare August 27, 2023 18:58
@Artturin Artturin changed the title gcc: move dll to output win-dll-links: also copy dll from dependancies Aug 27, 2023
@ofborg ofborg bot added 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 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: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Aug 27, 2023
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marius851000 I guess you meant

Suggested change
if [ "!${filesDone[$1]+a}" ]; then filesDone[$1]=a ; fi
if [ ! "${filesDone[$1]+a}" ]; then filesDone[$1]=a ; fi

here and below?

Copy link
Member Author

@Artturin Artturin Aug 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brano543 said the shellcheck commit broke something, maybe this is the breaking part.

Copy link
Member Author

@Artturin Artturin Aug 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Artturin Artturin changed the title win-dll-links: also copy dll from dependancies gcc: move dll to output Aug 28, 2023
@Artturin Artturin merged commit a90822c into NixOS:staging Aug 28, 2023
@Artturin Artturin deleted the gccfixes1 branch August 28, 2023 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: windows Running, or buiding, packages on Windows 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: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants