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.

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

stdenv/darwin: assemble full clang toolchain #94427

Draft
wants to merge 1 commit into
base: staging
from

Conversation

@thefloweringash
Copy link
Member

thefloweringash commented Aug 1, 2020

Adapted from main expression for clang 7.

Motivation for this change

Second part of #94426. See that ticket for the main context. This integrates compiler-rt into the toolchain, both from the re-added bootstrap level and for the higher level stdenvs.

I'm not all confident about the composition of the stages or if compiler-rt is rebuilt at the appropriate times.

cc @matthewbauer and @LnL7

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.
Adapted from main expression for clang 7.
@thefloweringash thefloweringash force-pushed the thefloweringash:bootstrap-unpack branch from 00cfe87 to 61c7485 Aug 3, 2020
@thefloweringash
Copy link
Member Author

thefloweringash commented Aug 3, 2020

The current state of this now is able to build perlPackages.LocaleGettext from an updated bootstrap tools. I put together a simple analysis for the structure of the stdenv and verified that this doesn't not change the structure in any interesting way. Since llvmPackages_7.compiler-rt depends on llvm, it is delayed until the same stage as the first llvm rebuild by copying it up from bootstrap tools until then.

The only remaining mystery is if libcxxabi is required. Including it in the same way as the main clang expression causes libcxx to reference two different libcxxabi packages.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

1 participant
You can’t perform that action at this time.