cc-wrapper: when merging gcc32 and gcc64, merge libgcc as well#230470
Merged
3 commits merged intomasterfrom May 9, 2023
unknown repository
Merged
cc-wrapper: when merging gcc32 and gcc64, merge libgcc as well#2304703 commits merged intomasterfrom unknown repository
3 commits merged intomasterfrom
unknown repository
Conversation
trofi
approved these changes
May 7, 2023
added 3 commits
May 9, 2023 00:16
Our gcc_multi and glibc_multi expressions merge together a 32-bit-targeted and 64-bit-targeted gcc. However they do not thread through the passthru.libgcc from these merged gccs. This commit corrects that. It also extends passthru.libgcc to allow a *list* rather than just a single outpath. Resolves part of #221891 (at least getting it back to the error message it gave before).
The phoney gcc that we construct for multilib was missing the `langCC` attribute, which `cc-wrapper` needs in order to decide whether or not to add gcc's `libstdc++` headers as an `-isystem` for `clang`.
The phoney gcc that we construct for multilib was missing the `$out/include/c++` directory which `cc-wrapper` needs to pass as an `-isystem` to `clang`. Closes #221891
trofi
approved these changes
May 9, 2023
Author
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Our gcc_multi and glibc_multi expressions merge together a 32-bit-targeted and 64-bit-targeted gcc. However they do not thread through the passthru.libgcc from these merged gccs.
This commit corrects that.
It also extends passthru.libgcc to allow a list rather than just a single outpath.
Resolves part of #221891 (at least getting it back to the error message it gave before).Edit: pushed two more commits; this now closes #221891.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)