Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

clang, cc-wrapper: Move --gcc-toolchain logic into CC wrapper #110251

Merged
merged 1 commit into from Jan 24, 2021
Merged

clang, cc-wrapper: Move --gcc-toolchain logic into CC wrapper #110251

merged 1 commit into from Jan 24, 2021

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Take 2, after #94582 had to be reverted.

This reverts commit ac03cfa.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ericson2314 Ericson2314 changed the title clang, cc-wrapper: Move --gcc-toolchain logic into CC wrapper WIP: clang, cc-wrapper: Move --gcc-toolchain logic into CC wrapper Jan 21, 2021
@Ericson2314 Ericson2314 mentioned this pull request Jan 21, 2021
Closed
10 tasks
@ofborg ofborg bot requested a review from davidtwco January 21, 2021 00:58
@Ericson2314 Ericson2314 changed the title WIP: clang, cc-wrapper: Move --gcc-toolchain logic into CC wrapper clang, cc-wrapper: Move --gcc-toolchain logic into CC wrapper Jan 21, 2021
@Ericson2314
Copy link
Member Author

@ofborg build tests.cc-multilib-clang

@matthewbauer
Copy link
Member

@Ericson2314 It would be nice to get rid of gccForLibs top-level. It looks like swift is still using it unfortunately.

@Ericson2314
Copy link
Member Author

Ericson2314 commented Jan 21, 2021 •
edited

@matthewbauer Uh oh, I tried locally, and the clang multi tests failed. I think we need to chop up useGccForLibs into the cxx and everything-else cases to do this right. We might also figure out what about the -B and -L is really needed in addition to --gcc-toolchain.

@Ericson2314
clang, cc-wrapper: Move --gcc-toolchain logic into CC wrapper
0710308 
Take 2, after NixOS#94582 had to be reverted.

This reverts commit ac03cfa.
@Ericson2314
Copy link
Member Author

Oh, the tests were already broken. Nevermind then.

@Ericson2314 Ericson2314 merged commit ebf4013 into NixOS:master Jan 24, 2021
@Ericson2314 Ericson2314 deleted the gcc-toolchain-cleanup branch January 24, 2021 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

@davidtwco davidtwco Awaiting requested review from davidtwco

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ericson2314 @matthewbauer