Skip to content

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
@ofborg ofborg bot requested a review from davidtwco January 21, 2021 00:58
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jan 21, 2021
@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

@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.

Take 2, after NixOS#94582 had to be reverted.

This reverts commit ac03cfa.
@Ericson2314 Ericson2314 force-pushed the gcc-toolchain-cleanup branch from 84ee000 to 0710308 Compare January 24, 2021 21:01
@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

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants